[pclasses-cvs] pclasses2/test Makefile.toc,1.13,1.14

[stephan b. <sg...@us...>]

Update of /cvsroot/pclasses/pclasses2/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26451/test

Modified Files:
	Makefile.toc 
Log Message:
Some unfortunate linker changes, due to inter-module deps.

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/test/Makefile.toc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.toc	29 Dec 2004 20:11:21 -0000	1.13
+++ Makefile.toc	29 Dec 2004 20:55:37 -0000	1.14
@@ -7,34 +7,15 @@
 DIST_FILES += $(HEADERS)
 
 SOURCES = \
-	CType.cpp \
-	FactoryTest.cpp \
-	IntTypeTest.cpp \
-	ListTest.cpp \
-	PtrTest.cpp \
-	QueueTest.cpp \
-	SimplePropertyStoreTest.cpp \
-	StackTest.cpp \
-	ThreadTest.cpp
+	$(wildcard *.cpp)
 
 DIST_FILES += $(SOURCES) $(HEADERS) \
 	in.s11n
 
-OBJECTS = \
-	IntTypeTest.o \
-	ListTest.o \
-	PtrTest.o \
-	QueueTest.o \
-	StackTest.o \
-	ThreadTest.o
-
-CLEAN_FILES += $(OBJECTS)
 
 build_bins = 1
 ifeq (1,$(build_bins))
-  BIN_PROGRAMS =  PtrTest StringToolTest
-#FactoryTest
-# s11nTest  SimplePropertyStoreTest
+  BIN_PROGRAMS =  PtrTest StringToolTest FactoryTest  s11nTest  SimplePropertyStoreTest
   BIN_PROGRAMS_LDADD = $(LIBP_TESTS_LDADD)
   FactoryTest_bin_OBJECTS = FactoryTest.o registrations.o
   FactoryTest_bin_LDADD = $(LIBPSYSTEM_CLIENT_LDADD) $(LIBPSIO_CLIENT_LDADD) $(LIBPUTIL_CLIENT_LDADD)
@@ -43,7 +24,7 @@
   PtrTest_bin_OBJECTS = PtrTest.o
   PtrTest_bin_LDADD = $(LIBPSYSTEM_CLIENT_LDADD)
   s11nTest_bin_OBJECTS = s11nTest.o registrations.o
-  s11nTest_bin_LDADD = $(LIBPS11N_CLIENT_LDADD) $(LIBPSYSTEM_CLIENT_LDADD) $(LIBPUTIL_CLIENT_LDADD)
+  s11nTest_bin_LDADD = $(LIBPSIO_CLIENT_LDADD) $(LIBPSYSTEM_CLIENT_LDADD) $(LIBPUTIL_CLIENT_LDADD)
   SimplePropertyStoreTest_bin_LDADD = $(s11nTest_bin_LDADD)
   SimplePropertyStoreTest_bin_OBJECTS = SimplePropertyStoreTest.o
   include $(TOC_MAKESDIR)/BIN_PROGRAMS.make