Create tcltest86.dll as dynamic Tcltest package

2 files changed, 24 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index f464aee..f9d4ae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-11-19  Jan Nijtmans  <nijtmans@users.sf.net>
 
+	* win/Makefile.in         Create tcltest86.dll as dynamic Tcltest package
 	* generic/tclTest.c       Remove extraneus prototypes, follow-up
 	* generic/tclTestObj.c    to [Bug 2883850]
 	* tests/chanio.test       Test-case for fixed [Bug 2849797]
diff --git a/win/Makefile.in b/win/Makefile.in
index 120d205..9636641 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.163 2009/11/18 23:46:05 nijtmans Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.164 2009/11/19 21:23:51 nijtmans Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -141,12 +141,14 @@ DDE_DLL_FILE		= tcldde$(DDEVER)${DLLSUFFIX}
 DDE_LIB_FILE		= tcldde$(DDEVER)${LIBSUFFIX}
 REG_DLL_FILE		= tclreg$(REGVER)${DLLSUFFIX}
 REG_LIB_FILE		= tclreg$(REGVER)${LIBSUFFIX}
+TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
+TEST_LIB_FILE		= tcltest$(VER)${LIBSUFFIX}
 PIPE_DLL_FILE		= tclpip$(VER)${DLLSUFFIX}
 
 SHARED_LIBRARIES 	= $(TCL_DLL_FILE) @ZLIB_DLL_FILE@ @UNICOWS_DLL_FILE@ $(TCL_STUB_LIB_FILE) \
-			  $(DDE_DLL_FILE) $(REG_DLL_FILE) $(PIPE_DLL_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) \
-			  $(DDE_DLL_FILE) $(REG_DLL_FILE)
+			  $(TEST_LIB_FILE) $(DDE_DLL_FILE) $(REG_DLL_FILE) $(TEST_DLL_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
@@ -213,8 +215,7 @@ TCLTEST_OBJS = \
 	tclTestObj.$(OBJEXT) \
 	tclTestProcBodyObj.$(OBJEXT) \
 	tclThreadTest.$(OBJEXT) \
-	tclWinTest.$(OBJEXT) \
-	testMain.$(OBJEXT)
+	tclWinTest.$(OBJEXT)
 
 GENERIC_OBJS = \
 	regcomp.$(OBJEXT) \
@@ -421,8 +422,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) $(CAT32) tclsh.$(RES)
-	$(CC) $(CFLAGS) $(TCLTEST_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
+$(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) \
         tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
 
 cat32.$(OBJEXT): cat.c
@@ -468,6 +469,15 @@ ${REG_LIB_FILE}: ${REG_OBJS} tclStubLib.$(OBJEXT)
 	@MAKE_LIB@ ${REG_OBJS} tclStubLib.$(OBJEXT)
 	@POST_MAKE_LIB@
 
+${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE}
+	@$(RM) ${TEST_DLL_FILE}
+	@MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
+
+${TEST_LIB_FILE}: ${TCLTEST_OBJS} tclStubLib.$(OBJEXT)
+	@$(RM) ${TEST_LIB_FILE}
+	@MAKE_LIB@ ${TCLTEST_OBJS} tclStubLib.$(OBJEXT)
+	@POST_MAKE_LIB@
+
 # use pre-built zlib1.dll
 ${ZLIB_DLL_FILE}: $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE}
 	@$(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}
@@ -510,6 +520,12 @@ tclTestObj.${OBJEXT}: tclTestObj.c
 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)
 
@@ -543,14 +559,6 @@ Zzutil.$(OBJEXT):    $(ZLIB_DIR)/zutil.c
 tclZlib.${OBJEXT} : tclZlib.c
 	$(CC) -c ${ZLIB_INC} $(CC_SWITCHES) -DBUILD_tcl @DEPARG@ $(CC_OBJNAME)
 
-# The following objects should be built using the stub interfaces
-
-tclWinReg.${OBJEXT} : tclWinReg.c
-	$(CC) -c $(CC_SWITCHES) -DUSE_TCL_STUBS @DEPARG@ $(CC_OBJNAME)
-
-tclWinDde.${OBJEXT} : tclWinDde.c
-	$(CC) -c $(CC_SWITCHES) -DUSE_TCL_STUBS @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