Merge of TkAqua Cocoa portmacosx_cocoa_merge

1 files changed, 23 insertions, 19 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index f9b44c3..399003a 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.153 2009/06/26 01:42:05 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.154 2009/06/29 14:35:01 das Exp $
 
 # Current Tk version;  used in various names.
 
@@ -398,7 +398,7 @@ AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \
 	tkMacOSXMenubutton.o tkMacOSXMenus.o tkMacOSXMouseEvent.o \
 	tkMacOSXNotify.o tkMacOSXRegion.o tkMacOSXScrlbr.o tkMacOSXSend.o \
 	tkMacOSXSubwindows.o tkMacOSXWindowEvent.o \
-	tkMacOSXWm.o tkMacOSXXStubs.o tkMacOSXCarbonEvents.o \
+	tkMacOSXWm.o tkMacOSXXStubs.o @EXTRA_AQUA_OBJS@ \
 	tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o tkUnixScale.o \
 	xcolors.o xdraw.o xgc.o ximage.o xutil.o \
 	ttkMacOSXTheme.o
@@ -526,7 +526,7 @@ AQUA_SRCS = \
 	$(MAC_OSX_DIR)/tkMacOSXSend.c $(MAC_OSX_DIR)/tkMacOSXSubwindows.c \
 	$(MAC_OSX_DIR)/tkMacOSXTest.c $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c \
 	$(MAC_OSX_DIR)/tkMacOSXWm.c $(MAC_OSX_DIR)/tkMacOSXXStubs.c \
-	$(MAC_OSX_DIR)/tkMacOSXCarbonEvents.c \
+	@EXTRA_AQUA_SRCS@ \
 	$(GENERIC_DIR)/tkFileFilter.c $(GENERIC_DIR)/tkMacWinMenu.c \
 	$(GENERIC_DIR)/tkPointer.c $(UNIX_DIR)/tkUnix3d.c \
 	$(UNIX_DIR)/tkUnixScale.c $(XLIB_DIR)/xcolors.c $(XLIB_DIR)/xdraw.c \
@@ -1218,9 +1218,6 @@ tkMacOSXBitmap.o: $(MAC_OSX_DIR)/tkMacOSXBitmap.c
 tkMacOSXButton.o: $(MAC_OSX_DIR)/tkMacOSXButton.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXButton.c
 
-tkMacOSXCarbonEvents.o: $(MAC_OSX_DIR)/tkMacOSXCarbonEvents.c
-	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXCarbonEvents.c
-
 tkMacOSXClipboard.o: $(MAC_OSX_DIR)/tkMacOSXClipboard.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXClipboard.c
 
@@ -1309,6 +1306,9 @@ tkMacOSXWm.o: $(MAC_OSX_DIR)/tkMacOSXWm.c
 tkMacOSXXStubs.o: $(MAC_OSX_DIR)/tkMacOSXXStubs.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXXStubs.c
 
+tkMacOSXCarbonEvents.o: $(TOP_DIR)/carbon/tkMacOSXCarbonEvents.c
+	$(CC) -c $(CC_SWITCHES) $(TOP_DIR)/carbon/tkMacOSXCarbonEvents.c
+
 tkFileFilter.o: $(GENERIC_DIR)/tkFileFilter.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFileFilter.c
 
@@ -1574,18 +1574,19 @@ dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(M
 	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/wish.exe.manifest.in
 	mkdir $(DISTDIR)/macosx
 	cp -p $(TOP_DIR)/macosx/GNUmakefile $(TOP_DIR)/macosx/README \
-		$(TOP_DIR)/macosx/Wish.icns $(TOP_DIR)/macosx/*.[chr] \
-		$(TOP_DIR)/macosx/*.in $(TOP_DIR)/macosx/*.ac \
-		$(TOP_DIR)/macosx/*.xcconfig $(TOP_DIR)/macosx/configure \
-		$(DISTDIR)/macosx
+		$(TOP_DIR)/macosx/*.icns $(TOP_DIR)/macosx/*.tiff \
+		$(TOP_DIR)/macosx/*.[ch] $(TOP_DIR)/macosx/*.in \
+		$(TOP_DIR)/macosx/*.ac $(TOP_DIR)/macosx/*.xcconfig \
+		$(TOP_DIR)/macosx/configure $(DISTDIR)/macosx
 	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/macosx
-	mkdir $(DISTDIR)/macosx/Wish.pbproj
-	cp -p $(TOP_DIR)/macosx/Wish.pbproj/*.pbx* $(DISTDIR)/macosx/Wish.pbproj
-	mkdir $(DISTDIR)/macosx/Wish.xcode
-	cp -p $(TOP_DIR)/macosx/Wish.xcode/*.pbx* $(DISTDIR)/macosx/Wish.xcode
-	mkdir $(DISTDIR)/macosx/Wish.xcodeproj
-	cp -p $(TOP_DIR)/macosx/Wish.xcodeproj/*.pbx* \
-		$(DISTDIR)/macosx/Wish.xcodeproj
+	mkdir $(DISTDIR)/macosx/Tk.xcode
+	cp -p $(TOP_DIR)/macosx/Tk.xcode/project.pbxproj \
+		$(TOP_DIR)/macosx/Tk.xcode/default.pbxuser \
+		$(DISTDIR)/macosx/Tk.xcode
+	mkdir $(DISTDIR)/macosx/Tk.xcodeproj
+	cp -p $(TOP_DIR)/macosx/Tk.xcodeproj/project.pbxproj \
+		$(TOP_DIR)/macosx/Tk.xcodeproj/default.pbxuser \
+		$(DISTDIR)/macosx/Tk.xcodeproj
 	mkdir $(DISTDIR)/carbon
 	cp -p $(TOP_DIR)/carbon/GNUmakefile $(TOP_DIR)/carbon/README \
 		$(TOP_DIR)/carbon/Wish.icns $(TOP_DIR)/carbon/*.[chr] \
@@ -1593,9 +1594,12 @@ dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(M
 		$(TOP_DIR)/carbon/*.xcconfig $(DISTDIR)/carbon
 	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/carbon
 	mkdir $(DISTDIR)/carbon/Wish.xcode
-	cp -p $(TOP_DIR)/carbon/Wish.xcode/*.pbx* $(DISTDIR)/carbon/Wish.xcode
+	cp -p $(TOP_DIR)/carbon/Wish.xcode/project.pbxproj \
+		$(TOP_DIR)/carbon/Wish.xcode/default.pbxuser \
+		$(DISTDIR)/carbon/Wish.xcode
 	mkdir $(DISTDIR)/carbon/Wish.xcodeproj
-	cp -p $(TOP_DIR)/carbon/Wish.xcodeproj/*.pbx* \
+	cp -p $(TOP_DIR)/carbon/Wish.xcodeproj/project.pbxproj \
+		$(TOP_DIR)/carbon/Wish.xcodeproj/default.pbxuser \
 		$(DISTDIR)/carbon/Wish.xcodeproj
 	mkdir $(DISTDIR)/compat
 	cp -p $(TOP_DIR)/license.terms $(TCLDIR)/compat/unistd.h \