diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tcl.h | 6 | ||||
| -rw-r--r-- | win/Makefile.in | 58 |
3 files changed, 39 insertions, 30 deletions
@@ -1,3 +1,8 @@ +2009-11-30 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tcl.h Don't use EXPORT for Tcl_InitStubs + * win/Makefile.in Better dependancies in case of static build. + 2009-11-30 Donal K. Fellows <dkf@users.sf.net> * doc/Tcl.n: [Bug 2901433]: Improved description of expansion to diff --git a/generic/tcl.h b/generic/tcl.h index 756015d..a13b897 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.292 2009/10/29 18:38:08 dgp Exp $ + * RCS: @(#) $Id: tcl.h,v 1.293 2009/11/30 23:10:38 nijtmans Exp $ */ #ifndef _TCL @@ -2309,9 +2309,9 @@ typedef int (*Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp, * main library in case an extension is statically linked into an application. */ -EXTERN const char * Tcl_InitStubs (Tcl_Interp *interp, const char *version, +const char * Tcl_InitStubs(Tcl_Interp *interp, const char *version, int exact); -EXTERN const char * TclTomMathInitializeStubs (Tcl_Interp *interp, +const char * TclTomMathInitializeStubs(Tcl_Interp *interp, const char *version, int epoch, int revision); #ifndef USE_TCL_STUBS diff --git a/win/Makefile.in b/win/Makefile.in index fc95cfc..66d0110 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.167 2009/11/26 07:01:52 nijtmans Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.168 2009/11/30 23:10:38 nijtmans Exp $ VERSION = @TCL_VERSION@ @@ -410,11 +410,11 @@ libraries: doc: -$(TCLSH): $(TCL_LIB_FILE) $(TCLSH_OBJS) tclsh.$(RES) - $(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(LIBS) \ +$(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES) + $(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) -$(TCLTEST): $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) ${TEST_LIB_FILE} testMain.$(OBJEXT) $(CAT32) tclsh.$(RES) +$(TCLTEST): testMain.$(OBJEXT) ${TEST_LIB_FILE} @LIBRARIES@ $(TCL_STUB_LIB_FILE) $(CAT32) tclsh.$(RES) $(CC) $(CFLAGS) testMain.$(OBJEXT) ${TEST_LIB_FILE} $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) @@ -436,50 +436,54 @@ ${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_LIB_FILE}: ${TCL_OBJS} ${STUB_OBJS} +${TCL_LIB_FILE}: ${TCL_OBJS} @$(RM) ${TCL_LIB_FILE} - @MAKE_LIB@ ${TCL_OBJS} ${STUB_OBJS} + @MAKE_LIB@ ${TCL_OBJS} @POST_MAKE_LIB@ # assume GNU make -${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE} - @-$(RM) ${DDE_DLL_FILE} ${DDE_LIB_FILE}.backup - @-$(COPY) ${DDE_LIB_FILE} ${DDE_LIB_FILE}.backup +# To enable concurrent parallel make of tcl<x>.dll and tcl<x>.lib, the tcl<x>.dll +# targets have to depend on tcl<x>.lib, this ensures that linking of tcl<x>.dll +# does not execute concurrently with the renaming and recompiling of tcl<x>.lib + +${DDE_DLL_FILE}: ${DDE_OBJS} ${DDE_LIB_FILE} ${TCL_STUB_LIB_FILE} + @-$(RM) ${DDE_DLL_FILE} ${DDE_LIB_FILE}.sav + @-$(COPY) ${DDE_LIB_FILE} ${DDE_LIB_FILE}.sav @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 + @-$(COPY) ${DDE_LIB_FILE}.sav ${DDE_LIB_FILE} + @-$(RM) ${DDE_LIB_FILE}.sav -${DDE_LIB_FILE}: ${DDE_OBJS} ${STUB_OBJS} +${DDE_LIB_FILE}: ${DDE_OBJS} @$(RM) ${DDE_LIB_FILE} - @MAKE_LIB@ ${DDE_OBJS} ${STUB_OBJS} + @MAKE_LIB@ ${DDE_OBJS} @POST_MAKE_LIB@ -${REG_DLL_FILE}: ${REG_OBJS} ${TCL_STUB_LIB_FILE} - @-$(RM) ${REG_DLL_FILE} ${REG_LIB_FILE}.backup - @-$(COPY) ${REG_LIB_FILE} ${REG_LIB_FILE}.backup +${REG_DLL_FILE}: ${REG_OBJS} ${REG_LIB_FILE} ${TCL_STUB_LIB_FILE} + @-$(RM) ${REG_DLL_FILE} ${REG_LIB_FILE}.sav + @-$(COPY) ${REG_LIB_FILE} ${REG_LIB_FILE}.sav @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 + @-$(COPY) ${REG_LIB_FILE}.sav ${REG_LIB_FILE} + @-$(RM) ${REG_LIB_FILE}.sav -${REG_LIB_FILE}: ${REG_OBJS} ${STUB_OBJS} +${REG_LIB_FILE}: ${REG_OBJS} @$(RM) ${REG_LIB_FILE} - @MAKE_LIB@ ${REG_OBJS} ${STUB_OBJS} + @MAKE_LIB@ ${REG_OBJS} @POST_MAKE_LIB@ -${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE} - @-$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}.backup - @-$(COPY) ${TEST_LIB_FILE} ${TEST_LIB_FILE}.backup +${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TEST_LIB_FILE} ${TCL_STUB_LIB_FILE} + @-$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}.sav + @-$(COPY) ${TEST_LIB_FILE} ${TEST_LIB_FILE}.sav @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 + @-$(COPY) ${TEST_LIB_FILE}.sav ${TEST_LIB_FILE} + @-$(RM) ${TEST_LIB_FILE}.sav -${TEST_LIB_FILE}: ${TCLTEST_OBJS} ${STUB_OBJS} +${TEST_LIB_FILE}: ${TCLTEST_OBJS} @$(RM) ${TEST_LIB_FILE} - @MAKE_LIB@ ${TCLTEST_OBJS} ${STUB_OBJS} + @MAKE_LIB@ ${TCLTEST_OBJS} @POST_MAKE_LIB@ # use pre-built zlib1.dll |