diff options
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index f5af0cb..a14cfdb 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.108 2005/08/25 04:13:42 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.109 2005/11/27 02:36:15 das Exp $ # Current Tk version; used in various names. @@ -298,7 +298,7 @@ RANLIB = @RANLIB@ SRC_DIR = @srcdir@ TOP_DIR = $(SRC_DIR)/.. GENERIC_DIR = $(TOP_DIR)/generic -UNIX_DIR = $(SRC_DIR) +UNIX_DIR = $(TOP_DIR)/unix BMAP_DIR = $(TOP_DIR)/bitmaps TOOL_DIR = @TCL_SRC_DIR@/tools MAC_OSX_DIR = $(TOP_DIR)/macosx @@ -532,8 +532,7 @@ objs: ${OBJS} wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@ - $(CC) $(LDFLAGS) $(WISH_OBJS) \ - @TK_BUILD_LIB_SPEC@ \ + ${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish # Resetting the LIB_RUNTIME_DIR below is required so that @@ -546,7 +545,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE) $(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR) tktest-real: - ${CC} $(LDFLAGS) $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \ + ${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest # FIXME: This xttest rule seems to be broken in a number of ways. @@ -554,7 +553,7 @@ tktest-real: # lib location logic from tktest, and it is not clear where this # test.o object file comes from. xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) - ${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \ + ${CC} ${CFLAGS} ${LDFLAGS} test.o tkTest.o tkSquare.o \ @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest @@ -818,8 +817,12 @@ depend: # Test binaries. The rule for tkTestInit.o is complicated because # it is is compiled from tkAppInit.c. Can't use the "-o" option # because this doesn't work on some strange compilers (e.g. UnixWare). +# To enable concurrent parallel make of wish and tktest, this target has to +# depend on wish, this ensures that linking of wish with tkTestInit.o does not +# execute concurrently with the renaming and recompiling of that same object +# file in the target below. -tkTestInit.o: $(UNIX_DIR)/tkAppInit.c +tkTestInit.o: $(UNIX_DIR)/tkAppInit.c wish @if test -f tkAppInit.o ; then \ rm -f tkAppInit.sav; \ mv tkAppInit.o tkAppInit.sav; \ @@ -1169,8 +1172,9 @@ tkMacOSXFont.o: $(MAC_OSX_DIR)/tkMacOSXFont.c tkMacOSXHLEvents.o: $(MAC_OSX_DIR)/tkMacOSXHLEvents.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXHLEvents.c -tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c - $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXInit.c +tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh + $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \ + $(MAC_OSX_DIR)/tkMacOSXInit.c tkMacOSXKeyboard.o: $(MAC_OSX_DIR)/tkMacOSXKeyboard.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXKeyboard.c @@ -1266,12 +1270,13 @@ genstubs: # tables. # -checkstubs: - -@for i in `nm -p $(TK_LIB_FILE) | awk '$$2 ~ /T/ { print $$3 }' \ +checkstubs: $(TK_LIB_FILE) + -@for i in `nm -p $(TK_LIB_FILE) \ + | awk '$$2 ~ /^[TDBCS]$$/ { sub("^_", "", $$3); print $$3 }' \ | sort -n`; do \ match=0; \ for j in $(TK_DECLS); do \ - if [ `grep -c $$i $$j` -gt 0 ]; then \ + if [ `grep -c "$$i *(" $$j` -gt 0 ]; then \ match=1; \ fi; \ done; \ @@ -1291,7 +1296,9 @@ checkuchar: # checkexports: $(TK_LIB_FILE) - -nm -p $(TK_LIB_FILE) | awk '$$2 ~ /[TDB]/ { print $$3 }' | sort -n | grep -v '^[Tt]k' + -@nm -p $(TK_LIB_FILE) \ + | awk '$$2 ~ /^[TDBCS]$$/ { sub("^_", "", $$3); print $$3 }' \ + | sort -n | grep -E -v '^([Tt]k|_?X)' || true # # Target to create a Tk RPM for Linux. Requires that you be on a Linux @@ -1376,13 +1383,17 @@ dist: $(UNIX_DIR)/configure $(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/*.rc $(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/wish.exe.manifest mkdir $(DISTDIR)/macosx - cp -p $(TOP_DIR)/macosx/Makefile $(TOP_DIR)/macosx/Wish.icns \ - $(TOP_DIR)/macosx/*.c $(TOP_DIR)/macosx/*.h $(TOP_DIR)/macosx/*.in \ - $(TOP_DIR)/macosx/*.r $(TOP_DIR)/macosx/*.tcl $(DISTDIR)/macosx + cp -p $(TOP_DIR)/macosx/GNUmakefile $(TOP_DIR)/macosx/README \ + $(TOP_DIR)/macosx/Wish.icns $(TOP_DIR)/macosx/*.c \ + $(TOP_DIR)/macosx/*.h $(TOP_DIR)/macosx/*.in \ + $(TOP_DIR)/macosx/*.r $(TOP_DIR)/macosx/*.ac $(DISTDIR)/macosx mkdir $(DISTDIR)/macosx/Wish.pbproj - cp -p $(TOP_DIR)/macosx/Wish.pbproj/*.pbx* \ - $(DISTDIR)/macosx/Wish.pbproj - cp -p $(TOP_DIR)/macosx/README $(DISTDIR)/macosx + 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)/compat cp -p $(TOP_DIR)/license.terms $(TCLDIR)/compat/unistd.h \ $(TCLDIR)/compat/stdlib.h $(TCLDIR)/compat/limits.h \ |