diff options
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 132 |
1 files changed, 42 insertions, 90 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 9636641..14208f5 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.164 2009/11/19 21:23:51 nijtmans Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.165 2009/11/23 20:17:36 nijtmans Exp $ VERSION = @TCL_VERSION@ @@ -132,23 +132,18 @@ REGDOTVER = @TCL_REG_MAJOR_VERSION@.@TCL_REG_MINOR_VERSION@ TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ TCL_DLL_FILE = @TCL_DLL_FILE@ -TCL_STATIC_LIB_FILE = @TCL_STATIC_LIB_FILE@ -TCL_IMPORT_LIB_FILE = @TCL_IMPORT_LIB_FILE@ TCL_LIB_FILE = @TCL_LIB_FILE@ -ZLIB_DLL_FILE = zlib1.dll -UNICOWS_DLL_FILE = unicows.dll DDE_DLL_FILE = tcldde$(DDEVER)${DLLSUFFIX} -DDE_LIB_FILE = tcldde$(DDEVER)${LIBSUFFIX} +DDE_LIB_FILE = @LIBPREFIX@tcldde$(DDEVER)${LIBSUFFIX} REG_DLL_FILE = tclreg$(REGVER)${DLLSUFFIX} -REG_LIB_FILE = tclreg$(REGVER)${LIBSUFFIX} +REG_LIB_FILE = @LIBPREFIX@tclreg$(REGVER)${LIBSUFFIX} TEST_DLL_FILE = tcltest$(VER)${DLLSUFFIX} -TEST_LIB_FILE = tcltest$(VER)${LIBSUFFIX} +TEST_LIB_FILE = @LIBPREFIX@tcltest$(VER)${LIBSUFFIX} PIPE_DLL_FILE = tclpip$(VER)${DLLSUFFIX} +ZLIB_DLL_FILE = zlib1.dll -SHARED_LIBRARIES = $(TCL_DLL_FILE) @ZLIB_DLL_FILE@ @UNICOWS_DLL_FILE@ $(TCL_STUB_LIB_FILE) \ - $(DDE_DLL_FILE) $(REG_DLL_FILE) $(TEST_DLL_FILE) $(PIPE_DLL_FILE) -STATIC_LIBRARIES = $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(REG_LIB_FILE) $(DDE_LIB_FILE) \ - $(TEST_LIB_FILE) $(DDE_DLL_FILE) $(REG_DLL_FILE) $(TEST_DLL_FILE) +SHARED_LIBRARIES = $(TCL_DLL_FILE) $(PIPE_DLL_FILE) @ZLIB_DLL_FILE@ +STATIC_LIBRARIES = $(TCL_LIB_FILE) $(REG_LIB_FILE) $(DDE_LIB_FILE) # TCL_EXE is the name of a tclsh executable that is available *BEFORE* running # make for the first time. Certain build targets (make genstubs) need it to be @@ -195,13 +190,11 @@ SHELL = @SHELL@ RM = rm -f COPY = cp -CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \ +CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} -I"${ZLIB_DIR}" \ -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" \ -I"${WIN_DIR_NATIVE}" ${AC_FLAGS} \ ${COMPILE_DEBUG_FLAGS} -ZLIB_INC = -I"${ZLIB_DIR}" - CC_OBJNAME = @CC_OBJNAME@ CC_EXENAME = @CC_EXENAME@ @@ -391,18 +384,17 @@ STUB_OBJS = \ TCLSH_OBJS = tclAppInit.$(OBJEXT) ZLIB_OBJS = \ - Zadler32.$(OBJEXT) \ - Zcompress.$(OBJEXT) \ - Zcrc32.$(OBJEXT) \ - Zdeflate.$(OBJEXT) \ - Zgzio.$(OBJEXT) \ - Zinfback.$(OBJEXT) \ - Zinffast.$(OBJEXT) \ - Zinflate.$(OBJEXT) \ - Zinftrees.$(OBJEXT) \ - Ztrees.$(OBJEXT) \ - Zuncompr.$(OBJEXT) \ - Zzutil.$(OBJEXT) + adler32.$(OBJEXT) \ + compress.$(OBJEXT) \ + crc32.$(OBJEXT) \ + deflate.$(OBJEXT) \ + infback.$(OBJEXT) \ + inffast.$(OBJEXT) \ + inflate.$(OBJEXT) \ + inftrees.$(OBJEXT) \ + trees.$(OBJEXT) \ + uncompr.$(OBJEXT) \ + zutil.$(OBJEXT) TCL_OBJS = ${GENERIC_OBJS} $(TOMMATH_OBJS) ${WIN_OBJS} @ZLIB_OBJS@ @@ -412,7 +404,7 @@ all: binaries libraries doc packages tcltest: $(TCLTEST) -binaries: @LIBRARIES@ $(TCLSH) +binaries: $(TCL_STUB_LIB_FILE) @LIBRARIES@ $(DDE_DLL_FILE) $(REG_DLL_FILE) $(TCLSH) libraries: @@ -422,8 +414,8 @@ $(TCLSH): $(TCL_LIB_FILE) $(TCLSH_OBJS) tclsh.$(RES) $(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) -$(TCLTEST): $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCLTEST_OBJS) testMain.$(OBJEXT) $(CAT32) tclsh.$(RES) - $(CC) $(CFLAGS) $(TCLTEST_OBJS) testMain.$(OBJEXT) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ +$(TCLTEST): $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) ${TEST_LIB_FILE} testMain.$(OBJEXT) $(CAT32) tclsh.$(RES) + $(CC) $(CFLAGS) testMain.$(OBJEXT) ${TEST_LIB_FILE} $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) cat32.$(OBJEXT): cat.c @@ -440,20 +432,24 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS} @MAKE_LIB@ ${STUB_OBJS} @POST_MAKE_LIB@ -${TCL_DLL_FILE} $(TCL_IMPORT_LIB_FILE): ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ @UNICOWS_DLL_FILE@ - @$(RM) ${TCL_DLL_FILE} $(TCL_IMPORT_LIB_FILE) +${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ + @$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE) @MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS) -${TCL_STATIC_LIB_FILE}: ${TCL_OBJS} - @$(RM) ${TCL_STATIC_LIB_FILE} +${TCL_LIB_FILE}: ${TCL_OBJS} + @$(RM) ${TCL_LIB_FILE} @MAKE_LIB@ ${TCL_OBJS} @POST_MAKE_LIB@ # assume GNU make ${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE} - @$(RM) ${DDE_DLL_FILE} + @-$(RM) ${DDE_DLL_FILE} ${DDE_LIB_FILE}.backup + @-$(COPY) ${DDE_LIB_FILE} ${DDE_LIB_FILE}.backup @MAKE_DLL@ ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) + @-$(RM) ${DDE_LIB_FILE} + @-$(COPY) ${DDE_LIB_FILE}.backup ${DDE_LIB_FILE} + @-$(RM) ${DDE_LIB_FILE}.backup ${DDE_LIB_FILE}: ${DDE_OBJS} tclStubLib.$(OBJEXT) @$(RM) ${DDE_LIB_FILE} @@ -461,8 +457,12 @@ ${DDE_LIB_FILE}: ${DDE_OBJS} tclStubLib.$(OBJEXT) @POST_MAKE_LIB@ ${REG_DLL_FILE}: ${REG_OBJS} ${TCL_STUB_LIB_FILE} - @$(RM) ${REG_DLL_FILE} + @-$(RM) ${REG_DLL_FILE} ${REG_LIB_FILE}.backup + @-$(COPY) ${REG_LIB_FILE} ${REG_LIB_FILE}.backup @MAKE_DLL@ ${REG_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) + @-$(RM) ${REG_LIB_FILE} + @-$(COPY) ${REG_LIB_FILE}.backup ${REG_LIB_FILE} + @-$(RM) ${REG_LIB_FILE}.backup ${REG_LIB_FILE}: ${REG_OBJS} tclStubLib.$(OBJEXT) @$(RM) ${REG_LIB_FILE} @@ -470,8 +470,12 @@ ${REG_LIB_FILE}: ${REG_OBJS} tclStubLib.$(OBJEXT) @POST_MAKE_LIB@ ${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE} - @$(RM) ${TEST_DLL_FILE} + @-$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}.backup + @-$(COPY) ${TEST_LIB_FILE} ${TEST_LIB_FILE}.backup @MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) + @-$(RM) ${TEST_LIB_FILE} + @-$(COPY) ${TEST_LIB_FILE}.backup ${TEST_LIB_FILE} + @-$(RM) ${TEST_LIB_FILE}.backup ${TEST_LIB_FILE}: ${TCLTEST_OBJS} tclStubLib.$(OBJEXT) @$(RM) ${TEST_LIB_FILE} @@ -482,10 +486,6 @@ ${TEST_LIB_FILE}: ${TCLTEST_OBJS} tclStubLib.$(OBJEXT) ${ZLIB_DLL_FILE}: $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} @$(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE} -# use pre-built unicows.dll -${UNICOWS_DLL_FILE}: $(COMPAT_DIR)/mslu/${UNICOWS_DLL_FILE} - @$(COPY) $(COMPAT_DIR)/mslu/${UNICOWS_DLL_FILE} ${UNICOWS_DLL_FILE} - # PIPE_DLL_FILE is actually an executable, don't build it like a DLL. ${PIPE_DLL_FILE}: ${PIPE_OBJS} @@ -511,54 +511,6 @@ tclWinPipe.${OBJEXT}: tclWinPipe.c testMain.${OBJEXT}: tclAppInit.c $(CC) -c $(CC_SWITCHES) -DTCL_TEST @DEPARG@ $(CC_OBJNAME) -tclTest.${OBJEXT}: tclTest.c - $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) - -tclTestObj.${OBJEXT}: tclTestObj.c - $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) - -tclWinTest.${OBJEXT}: tclWinTest.c - $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) - -tclWinReg.${OBJEXT}: tclWinReg.c - $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) - -tclWinDde.${OBJEXT}: tclWinDde.c - $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) - -tclAppInit.${OBJEXT} : tclAppInit.c - $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) - -# For building zlib, only used in some build configurations - -Zadler32.$(OBJEXT): $(ZLIB_DIR)/adler32.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zcompress.$(OBJEXT): $(ZLIB_DIR)/compress.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zcrc32.$(OBJEXT): $(ZLIB_DIR)/crc32.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zdeflate.$(OBJEXT): $(ZLIB_DIR)/deflate.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zgzio.$(OBJEXT): $(ZLIB_DIR)/gzio.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zinfback.$(OBJEXT): $(ZLIB_DIR)/infback.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zinffast.$(OBJEXT): $(ZLIB_DIR)/inffast.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zinflate.$(OBJEXT): $(ZLIB_DIR)/inflate.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zinftrees.$(OBJEXT): $(ZLIB_DIR)/inftrees.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Ztrees.$(OBJEXT): $(ZLIB_DIR)/trees.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zuncompr.$(OBJEXT): $(ZLIB_DIR)/uncompr.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) -Zzutil.$(OBJEXT): $(ZLIB_DIR)/zutil.c - $(CC) -c $(CC_SWITCHES) -I$(ZLIB_DIR) @DEPARG@ $(CC_OBJNAME) - -tclZlib.${OBJEXT} : tclZlib.c - $(CC) -c ${ZLIB_INC} $(CC_SWITCHES) -DBUILD_tcl @DEPARG@ $(CC_OBJNAME) - # TIP #59, embedding of configuration information into the binary library. # # Part of Tcl's configuration information are the paths where it was installed @@ -638,7 +590,7 @@ install-binaries: binaries else true; \ fi; \ done; - @for i in $(TCL_DLL_FILE) $(ZLIB_DLL_FILE) $(UNICOWS_DLL_FILE) $(TCLSH) $(PIPE_DLL_FILE); \ + @for i in $(TCL_DLL_FILE) $(ZLIB_DLL_FILE) $(TCLSH) $(PIPE_DLL_FILE); \ do \ if [ -f $$i ]; then \ echo "Installing $$i to $(BIN_INSTALL_DIR)/"; \ |