diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-07 15:08:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-07 15:08:16 (GMT) |
| commit | 49baa37b9ceaea45c5bc3648673a4c7b786d76cf (patch) | |
| tree | aec1cd974eb7ee0f1fede5b375e4b14a85e7567b /win/Makefile.in | |
| parent | f6bd13629fa5edb7707fc6adb73029c9a09b5e1f (diff) | |
| download | tcl-49baa37b9ceaea45c5bc3648673a4c7b786d76cf.zip tcl-49baa37b9ceaea45c5bc3648673a4c7b786d76cf.tar.gz tcl-49baa37b9ceaea45c5bc3648673a4c7b786d76cf.tar.bz2 | |
Put dde/registry obj-files in the stub library in stead of the static library. Needed to combine --disable-shared build of Tk with --enable-shared build of Tcl in a single executable
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index a0daf24..298b72d 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -559,9 +559,9 @@ $(CAT32): cat32.$(OBJEXT) # The following targets are configured by autoconf to generate either a shared # library or static library -${TCL_STUB_LIB_FILE}: ${STUB_OBJS} +${TCL_STUB_LIB_FILE}: ${STUB_OBJS} ${DDE_OBJS} ${REG_OBJS} @$(RM) ${TCL_STUB_LIB_FILE} - @MAKE_STUB_LIB@ ${STUB_OBJS} + @MAKE_STUB_LIB@ ${STUB_OBJS} ${DDE_OBJS} ${REG_OBJS} @POST_MAKE_LIB@ ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ @TOMMATH_DLL_FILE@ ${TCL_ZIP_FILE} @@ -575,12 +575,12 @@ ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ @TOMMATH_DLL_FILE@ ${TCL || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ fi -${TCL_LIB_FILE}: ${TCL_OBJS} ${DDE_OBJS} ${REG_OBJS} +${TCL_LIB_FILE}: ${TCL_OBJS} @$(RM) ${TCL_LIB_FILE} @MAKE_LIB@ ${TCL_OBJS} ${DDE_OBJS} ${REG_OBJS} @POST_MAKE_LIB@ -${DDE_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${DDE_OBJS} +${DDE_DLL_FILE}: ${TCL_STUB_LIB_FILE} @MAKE_DLL@ ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) $(COPY) tclsh.exe.manifest ${DDE_DLL_FILE}.manifest |