diff --git a/src/cxxTemplates/test/Makefile b/src/cxxTemplates/test/Makefile
index fb1fa1129..915666764 100644
--- a/src/cxxTemplates/test/Makefile
+++ b/src/cxxTemplates/test/Makefile
@@ -3,13 +3,41 @@ TOP=../../..
 
 include $(TOP)/configure/CONFIG
 
+resourceLibTest_SRCS += resourceLibTest.cc
+PROD += resourceLibTest
+OBJS_IOC += resourceLibTest
+
+tsDLListBench_SRCS += tsDLListBench.cc
+PROD += tsDLListBench
+OBJS_IOC += tsDLListBench
+
+tsDLListTest_SRCS += tsDLListTest.cc
+PROD += tsDLListTest
+OBJS_IOC += tsDLListTest
+
+tsSLListBench_SRCS += tsSLListBench.cc
+PROD += tsSLListBench
+OBJS_IOC += tsSLListBench
+
+tsSLListTest_SRCS += tsSLListTest.cc
+PROD += tsSLListTest
+OBJS_IOC += tsSLListTest
+
+minmaxTest_SRCS += minmaxTest.cc
+PROD += minmaxTest
+OBJS_IOC += minmaxTest
+
+tsBTreeTest_SRCS += tsBTreeTest.cc
+PROD += tsBTreeTest
+OBJS_IOC += tsBTreeTest
+
+tsBTreeBench_SRCS += tsBTreeBench.cc
+PROD += tsBTreeBench
+OBJS_IOC += tsBTreeBench
+
 CXXCMPLR = STRICT
 
 PROD_LIBS = Com
-SYS_PROD_LIBS_WIN32 := ws2_32 advapi32
-
-TESTPROD := resourceLibTest tsDLListBench tsDLListTest tsDLListTest \
-		tsSLListBench tsSLListTest minmaxTest tsBTreeBench tsBTreeTest
 
 include $(TOP)/configure/RULES
 
diff --git a/src/libCom/cxxTemplates/test/Makefile b/src/libCom/cxxTemplates/test/Makefile
index fb1fa1129..915666764 100644
--- a/src/libCom/cxxTemplates/test/Makefile
+++ b/src/libCom/cxxTemplates/test/Makefile
@@ -3,13 +3,41 @@ TOP=../../..
 
 include $(TOP)/configure/CONFIG
 
+resourceLibTest_SRCS += resourceLibTest.cc
+PROD += resourceLibTest
+OBJS_IOC += resourceLibTest
+
+tsDLListBench_SRCS += tsDLListBench.cc
+PROD += tsDLListBench
+OBJS_IOC += tsDLListBench
+
+tsDLListTest_SRCS += tsDLListTest.cc
+PROD += tsDLListTest
+OBJS_IOC += tsDLListTest
+
+tsSLListBench_SRCS += tsSLListBench.cc
+PROD += tsSLListBench
+OBJS_IOC += tsSLListBench
+
+tsSLListTest_SRCS += tsSLListTest.cc
+PROD += tsSLListTest
+OBJS_IOC += tsSLListTest
+
+minmaxTest_SRCS += minmaxTest.cc
+PROD += minmaxTest
+OBJS_IOC += minmaxTest
+
+tsBTreeTest_SRCS += tsBTreeTest.cc
+PROD += tsBTreeTest
+OBJS_IOC += tsBTreeTest
+
+tsBTreeBench_SRCS += tsBTreeBench.cc
+PROD += tsBTreeBench
+OBJS_IOC += tsBTreeBench
+
 CXXCMPLR = STRICT
 
 PROD_LIBS = Com
-SYS_PROD_LIBS_WIN32 := ws2_32 advapi32
-
-TESTPROD := resourceLibTest tsDLListBench tsDLListTest tsDLListTest \
-		tsSLListBench tsSLListTest minmaxTest tsBTreeBench tsBTreeTest
 
 include $(TOP)/configure/RULES