summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2009-11-10 23:36:19 (GMT)
committerandreas_kupries <akupries@shaw.ca>2009-11-10 23:36:19 (GMT)
commit952725c4a425e417260213b7400343a0f4a891e4 (patch)
treead1faa4d16b81d6e6a1785df13bfdfe624f49e5c /unix
parent55f7e0cf3aa4d25e8c0b84f1eb98b514a7160818 (diff)
downloadtk-952725c4a425e417260213b7400343a0f4a891e4.zip
tk-952725c4a425e417260213b7400343a0f4a891e4.tar.gz
tk-952725c4a425e417260213b7400343a0f4a891e4.tar.bz2
* unix/Makefile.in: Partially reverted Don Porter's 2009-10-20
* win/Makefile.in: commit. The OSX Cocoa code branch still needs tclInt.h and the internal headers, thus the TCL_PLATFORM directory. See tclMacOSXNotify.c for example.
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index dd87214..3e152b1 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.159 2009/10/26 16:56:46 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.160 2009/11/10 23:36:19 andreas_kupries Exp $
# Current Tk version; used in various names.
@@ -103,6 +103,10 @@ DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos
# been replaced by the configure script):
TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic
+# The directory containing the platform specific Tcl sources and headers
+# appropriate for this version of Tk:
+TCL_PLATFORM_DIR = @TCL_SRC_DIR@/unix
+
# The directory containing the Tcl library archive file appropriate
# for this version of Tk:
TCL_BIN_DIR = @TCL_BIN_DIR@
@@ -324,7 +328,7 @@ CC = @CC@
CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
-${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} \
+-I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} \
${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@
@@ -333,7 +337,7 @@ CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS}
APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@
DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
--I${TCL_GENERIC_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} \
+-I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM@_INCLUDES} \
${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@