diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | generic/tkPort.h | 4 | ||||
| -rw-r--r-- | unix/Makefile.in | 10 | ||||
| -rw-r--r-- | win/Makefile.in | 16 |
4 files changed, 29 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2004-04-24 Daniel Steffen <das@users.sourceforge.net> + + * generic/tkPort.h: + * unix/Makefile.in: + * win/Makefile.in: followup on tcl header reform [FR 922727]: + removed use of relative #include paths in tkPort.h to allow + installation of private headers outside of tk source tree; added + tcl plaform source dir to compiler header search path. + 2004-04-23 Donal K. Fellows <donal.k.fellows@man.ac.uk> * doc/bind.n: Added examples (in line with the parallel programme diff --git a/generic/tkPort.h b/generic/tkPort.h index ae59dd9..17d0def 100644 --- a/generic/tkPort.h +++ b/generic/tkPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPort.h,v 1.5 2004/03/17 18:15:44 das Exp $ + * RCS: @(#) $Id: tkPort.h,v 1.6 2004/04/24 06:00:18 das Exp $ */ #ifndef _TKPORT @@ -29,7 +29,7 @@ # if defined(MAC_OSX_TK) # include "tkMacOSXPort.h" # else -# include "../unix/tkUnixPort.h" +# include "tkUnixPort.h" # endif #endif diff --git a/unix/Makefile.in b/unix/Makefile.in index f1192fc..cbb75ad 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.92 2004/03/17 18:15:50 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.93 2004/04/24 06:00:18 das Exp $ # Current Tk version; used in various names. @@ -82,6 +82,10 @@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann # 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@ @@ -282,7 +286,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} ${X11_INCLUDES} \ +-I${BMAP_DIR} -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${X11_INCLUDES} \ ${AC_FLAGS} ${PROTO_FLAGS} \ ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} @@ -290,7 +294,7 @@ CC_SWITCHES = ${CC_SWITCHES_NO_STUBS} ${TCL_STUB_FLAGS} DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \ -I${BMAP_DIR} \ --I${TCL_GENERIC_DIR} ${X11_INCLUDES} \ +-I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${X11_INCLUDES} \ ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \ ${KEYSYM_FLAGS} diff --git a/win/Makefile.in b/win/Makefile.in index aa8c21a..91a5c4f 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.60 2003/10/08 21:49:56 patthoyts Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.61 2004/04/24 06:00:20 das Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -89,8 +89,13 @@ TCL_BIN_DIR = @TCL_BIN_DIR@ # The directory containing the Tcl sources and headers appropriate # for this version of Tk ("srcdir" will be replaced or has already # been replaced by the configure script): -TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic -TCL_TOOL_DIR = @TCL_SRC_DIR@/tools +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@/win + +TCL_TOOL_DIR = @TCL_SRC_DIR@/tools # Converts a POSIX path to a Windows native path. CYGPATH = @CYGPATH@ @@ -114,6 +119,7 @@ GENERIC_DIR_NATIVE = $(shell $(CYGPATH) '$(GENERIC_DIR)') BITMAP_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)/bitmaps') XLIB_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)/xlib') TCL_GENERIC_NATIVE = $(shell $(CYGPATH) '$(TCL_GENERIC_DIR)') +TCL_PLATFORM_NATIVE = $(shell $(CYGPATH) '$(TCL_PLATFORM_DIR)') TCL_SRC_DIR_NATIVE = $(shell $(CYGPATH) '$(TCL_SRC_DIR)') RC_DIR_NATIVE = $(shell $(CYGPATH) '$(RC_DIR)') @@ -201,7 +207,7 @@ TCL_EXE = tclsh CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I"${GENERIC_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ -I"${XLIB_DIR_NATIVE}" -I"${BITMAP_DIR_NATIVE}" \ - -I"${TCL_GENERIC_NATIVE}" ${AC_FLAGS} +-I"${TCL_GENERIC_NATIVE}" -I"${TCL_PLATFORM_NATIVE}" ${AC_FLAGS} CC_OBJNAME = @CC_OBJNAME@ CC_EXENAME = @CC_EXENAME@ @@ -588,7 +594,7 @@ tkSquare.$(OBJEXT): tkSquare.c $(CC) -c $(STUB_CC_SWITCHES) -DBUILD_tk @DEPARG@ $(CC_OBJNAME) .rc.$(RES): - $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" @DEPARG@ + $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(TCL_PLATFORM_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" @DEPARG@ depend: |