summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authordas <das>2005-04-26 00:44:50 (GMT)
committerdas <das>2005-04-26 00:44:50 (GMT)
commitec3f17501d816894810d4d4ea984e4f60e6217fe (patch)
tree870018fbbebc7227bc3dc1184a844d0917132e2c /unix/Makefile.in
parenta03466eb703f065ba168616a8322005b0555df91 (diff)
downloadtcl-ec3f17501d816894810d4d4ea984e4f60e6217fe.zip
tcl-ec3f17501d816894810d4d4ea984e4f60e6217fe.tar.gz
tcl-ec3f17501d816894810d4d4ea984e4f60e6217fe.tar.bz2
* compat/string.h: fixed memchr() protoype for __APPLE__ so that we
build on Mac OS X 10.1 again. * generic/tclNotify.c (TclFinalizeNotifier): fixed notifier not being finalized in unthreaded core (was testing for notifier initialization in current thread by checking thread id != 0 but thread id is always 0 in untreaded core). * win/tclWinNotify.c (Tcl_WaitForEvent): * unix/tclUnixNotfy.c (Tcl_WaitForEvent): don't call ScaleTimeProc for zero wait times (as specified in TIP 233). * unix/Makefile.in: added @PLAT_SRCS@ to SRCS and split out NOTIFY_SRCS from UNIX_SRCS for parity with UNIX_OBJS & NOTIFY_OBJS. * unix/tcl.m4 (Darwin): added configure checks for recently added linker flags -single_module and -search_paths_first to allow building with older tools (and on Mac OS X 10.1), use -single_module in SHLIB_LD and not just T{CL,K}_SHLIB_LD_EXTRAS, added unexporting from Tk of symbols from libtclstub to avoid duplicate symbol warnings, added PLAT_SRCS definition for Mac OS X, defined MODULE_SCOPE to __private_extern__. (SC_MISSING_POSIX_HEADERS): added caching of dirent.h check. * unix/configure: autoconf-2.59
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index cdfdecd..ad3fe35 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.163 2005/02/24 18:05:42 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.164 2005/04/26 00:45:02 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -414,7 +414,6 @@ UNIX_SRCS = \
$(UNIX_DIR)/tclUnixEvent.c \
$(UNIX_DIR)/tclUnixFCmd.c \
$(UNIX_DIR)/tclUnixFile.c \
- $(UNIX_DIR)/tclUnixNotfy.c \
$(UNIX_DIR)/tclUnixPipe.c \
$(UNIX_DIR)/tclUnixSock.c \
$(UNIX_DIR)/tclUnixTest.c \
@@ -422,6 +421,9 @@ UNIX_SRCS = \
$(UNIX_DIR)/tclUnixTime.c \
$(UNIX_DIR)/tclUnixInit.c
+NOTIFY_SRCS = \
+ $(UNIX_DIR)/tclUnixNotfy.c
+
DL_SRCS = \
$(UNIX_DIR)/tclLoadAix.c \
$(UNIX_DIR)/tclLoadAout.c \
@@ -441,7 +443,7 @@ MAC_OSX_SRCS = \
# files won't compile on the current machine, and they will cause
# problems for things like "make depend".
-SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS)
+SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) $(STUB_SRCS) @PLAT_SRCS@
all: binaries libraries doc
@@ -1109,7 +1111,7 @@ tclUnixInit.o: $(UNIX_DIR)/tclUnixInit.c tclConfig.sh
-DTCL_PACKAGE_PATH="\"${TCL_PACKAGE_PATH}\"" \
$(UNIX_DIR)/tclUnixInit.c
-# This is the CFBundle interface. It is only used on Mac OS X.
+# The following are Mac OS X only sources:
tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMacOSXBundle.c
$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tclMacOSXBundle.c