diff options
| author | dgp <dgp@users.sourceforge.net> | 2009-10-20 16:57:25 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2009-10-20 16:57:25 (GMT) |
| commit | 1a5b41be4ec767d74a921e19a5d4f0814f037257 (patch) | |
| tree | 8506de0b1ab0dd8eb68188e7a07bd644182c9c45 /win | |
| parent | b60592416c6954354b39aea23c57a23f4dff2dc9 (diff) | |
| download | tk-1a5b41be4ec767d74a921e19a5d4f0814f037257.zip tk-1a5b41be4ec767d74a921e19a5d4f0814f037257.tar.gz tk-1a5b41be4ec767d74a921e19a5d4f0814f037257.tar.bz2 | |
* unix/Makefile.in: Compiling Tk no longer requires header files
* win/Makefile.in: from the TCL_PLATFORM DIR. Baby step in
pursuit of [Bug 1712098].
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 94a5b28..f73db98 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.83 2008/12/28 13:08:39 dkf Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.84 2009/10/20 16:57:25 dgp Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -96,10 +96,6 @@ TCL_BIN_DIR = @TCL_BIN_DIR@ # 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@/win - TCL_TOOL_DIR = @TCL_SRC_DIR@/tools # Converts a POSIX path to a Windows native path. @@ -126,7 +122,6 @@ BITMAP_DIR_NATIVE = $(ROOT_DIR_NATIVE)/bitmaps XLIB_DIR_NATIVE = $(ROOT_DIR_NATIVE)/xlib RC_DIR_NATIVE = $(WIN_DIR_NATIVE)/rc TCL_GENERIC_NATIVE = $(shell $(CYGPATH) '$(TCL_GENERIC_DIR)' | sed 's!\\!/!g') -TCL_PLATFORM_NATIVE = $(shell $(CYGPATH) '$(TCL_PLATFORM_DIR)' | sed 's!\\!/!g') TCL_SRC_DIR_NATIVE = $(shell $(CYGPATH) '$(TCL_SRC_DIR)' | sed 's!\\!/!g') DLLSUFFIX = @DLLSUFFIX@ @@ -213,7 +208,7 @@ TCL_EXE = @TCLSH_PROG@ 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}" -I"${TCL_PLATFORM_NATIVE}" ${AC_FLAGS} +-I"${TCL_GENERIC_NATIVE}" ${AC_FLAGS} CC_OBJNAME = @CC_OBJNAME@ CC_EXENAME = @CC_EXENAME@ @@ -673,7 +668,7 @@ tkWindow.$(OBJEXT): configure Makefile $(CC) -c $(STUB_CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME) .rc.$(RES): - $(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@ + $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" @DEPARG@ depend: |