diff options
| author | mdejong <mdejong> | 2003-04-15 00:18:57 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2003-04-15 00:18:57 (GMT) |
| commit | 2a5e8ea0fe0425bc720720143368245aa5a28ff9 (patch) | |
| tree | d2ab030b5fa73dfe9e9c6cf1e2e0f5d220b97f33 /win/Makefile.in | |
| parent | 27ba35ea0d688699a5c3641edbe164a4c125d031 (diff) | |
| download | tcl-2a5e8ea0fe0425bc720720143368245aa5a28ff9.zip tcl-2a5e8ea0fe0425bc720720143368245aa5a28ff9.tar.gz tcl-2a5e8ea0fe0425bc720720143368245aa5a28ff9.tar.bz2 | |
* win/Makefile.in: Don't define TCL_DBGX
symbol for every compile. Instead, define
TCL_PIPE_DLL only when compiling tclWinPipe.c.
This will break other build systems, so
they will need to remove the TCL_DBGX define
and replace it with a define for TCL_PIPE_DLL.
* win/tclWinPipe.c (TclpCreateProcess):
Remove PREFIX_IDENT and DEBUG_IDENT from
top of file. Use TCL_PIPE_DLL passed in
from build env instead of trying to construct
the dll name from already defined symbols.
This approach is more flexible and better
in the long run.
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 75150aa..a008ab1 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.70 2003/04/12 19:51:24 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.71 2003/04/15 00:18:58 mdejong Exp $ VERSION = @TCL_VERSION@ @@ -85,7 +85,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX) +CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ # To enable compilation debugging reverse the comment characters on # one of the following lines. @@ -115,6 +115,13 @@ DLLSUFFIX = @DLLSUFFIX@ LIBSUFFIX = @LIBSUFFIX@ EXESUFFIX = @EXESUFFIX@ +VER = @TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@ +DOTVER = @TCL_MAJOR_VERSION@.@TCL_MINOR_VERSION@ +DDEVER = @TCL_DDE_MAJOR_VERSION@@TCL_DDE_MINOR_VERSION@ +DDEDOTVER = @TCL_DDE_MAJOR_VERSION@.@TCL_DDE_MINOR_VERSION@ +REGVER = @TCL_REG_MAJOR_VERSION@@TCL_REG_MINOR_VERSION@ +REGDOTVER = @TCL_REG_MAJOR_VERSION@.@TCL_REG_MINOR_VERSION@ + TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ TCL_DLL_FILE = @TCL_DLL_FILE@ TCL_LIB_FILE = @TCL_LIB_FILE@ @@ -167,12 +174,6 @@ SHLIB_LD = @SHLIB_LD@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(LIBS) SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ -VER = @TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@ -DOTVER = @TCL_MAJOR_VERSION@.@TCL_MINOR_VERSION@ -DDEVER = @TCL_DDE_MAJOR_VERSION@@TCL_DDE_MINOR_VERSION@ -DDEDOTVER = @TCL_DDE_MAJOR_VERSION@.@TCL_DDE_MINOR_VERSION@ -REGVER = @TCL_REG_MAJOR_VERSION@@TCL_REG_MINOR_VERSION@ -REGDOTVER = @TCL_REG_MAJOR_VERSION@.@TCL_REG_MINOR_VERSION@ LIBS = @LIBS@ RMDIR = rm -rf @@ -385,6 +386,10 @@ ${PIPE_DLL_FILE}: ${PIPE_OBJS} tclWinInit.${OBJEXT}: tclWinInit.c $(CC) -c $(CC_SWITCHES) -DBUILD_tcl $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME) +tclWinPipe.${OBJEXT}: tclWinPipe.c + $(CC) -c $(CC_SWITCHES) -DBUILD_tcl -DTCL_PIPE_DLL=\"$(PIPE_DLL_FILE)\" \ + $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME) + testMain.${OBJEXT}: tclAppInit.c $(CC) -c $(CC_SWITCHES) -DTCL_TEST @DEPARG@ $(CC_OBJNAME) |