Index: trunk/psLib/test/sys/Makefile.am
===================================================================
--- trunk/psLib/test/sys/Makefile.am	(revision 4547)
+++ trunk/psLib/test/sys/Makefile.am	(revision 4549)
@@ -1,3 +1,3 @@
-#Makefile for mathtypes tests
+#Makefile for sys tests
 #
 AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
@@ -12,11 +12,11 @@
 	tst_psTrace
 
-tst_psImage_SOURCES =  tst_psImage.c
-tst_psScalar_SOURCES =  tst_psScalar.c
-tst_psVector_SOURCES =  tst_psVector.c
-tst_psVectorSort_01_SOURCES =  tst_psVectorSort_01.c
-tst_psVectorSort_02_SOURCES =  tst_psVectorSort_02.c
-tst_psVectorSort_03_SOURCES =  tst_psVectorSort_03.c
-tst_psVectorSort_04_SOURCES =  tst_psVectorSort_04.c
+tst_psAbort_SOURCES =  tst_psAbort.c
+tst_psConfigure_SOURCES =  tst_psConfigure.c
+tst_psError_SOURCES =  tst_psError.c
+tst_psLogMsg_SOURCES =  tst_psLogMsg.c
+tst_psMemory_SOURCES =  tst_psMemory.c
+tst_psString_SOURCES =  tst_psString.c
+tst_psTrace_SOURCES =  tst_psTrace.c
 
 check_DATA =
Index: trunk/psLib/test/types/Makefile.am
===================================================================
--- trunk/psLib/test/types/Makefile.am	(revision 4547)
+++ trunk/psLib/test/types/Makefile.am	(revision 4549)
@@ -4,19 +4,44 @@
 
 TESTS = \
-	tst_psImage \
-	tst_psScalar \
-	tst_psVector \
-	tst_psVectorSort_01 \
-	tst_psVectorSort_02 \
-	tst_psVectorSort_03 \
-	tst_psVectorSort_04
+	tst_psArray \
+	tst_psBitSet \
+	tst_psHash00          \
+	tst_psHash01          \
+	tst_psHash02          \
+	tst_psHash03          \
+	tst_psHash04          \
+	tst_psHash05          \
+	tst_psList            \
+	tst_psLookupTable_01  \
+	tst_psMetadata_01 \
+	tst_psMetadata_02 \
+	tst_psMetadata_03 \
+	tst_psMetadata_04 \
+	tst_psMetadata_05 \
+	tst_psMetadata_06 \
+	tst_psMetadata_07 \
+	tst_psMetadataIO  \
+	tst_psPixels
 
-tst_psImage_SOURCES =  tst_psImage.c
-tst_psScalar_SOURCES =  tst_psScalar.c
-tst_psVector_SOURCES =  tst_psVector.c
-tst_psVectorSort_01_SOURCES =  tst_psVectorSort_01.c
-tst_psVectorSort_02_SOURCES =  tst_psVectorSort_02.c
-tst_psVectorSort_03_SOURCES =  tst_psVectorSort_03.c
-tst_psVectorSort_04_SOURCES =  tst_psVectorSort_04.c
+
+tst_psArray_SOURCES = tst_psArray.c
+tst_psBitSet_SOURCES = tst_psBitSet.c
+tst_psHash00_SOURCES = tst_psHash00.c
+tst_psHash01_SOURCES = tst_psHash01.c
+tst_psHash02_SOURCES = tst_psHash02.c
+tst_psHash03_SOURCES = tst_psHash03.c
+tst_psHash04_SOURCES = tst_psHash04.c
+tst_psHash05_SOURCES = tst_psHash05.c
+tst_psList_SOURCES = tst_psList.c
+tst_psLookupTable_01_SOURCES = tst_psLookupTable_01.c
+tst_psMetadata_01_SOURCES = tst_psMetadata_01.c
+tst_psMetadata_02_SOURCES = tst_psMetadata_02.c
+tst_psMetadata_03_SOURCES = tst_psMetadata_03.c
+tst_psMetadata_04_SOURCES = tst_psMetadata_04.c
+tst_psMetadata_05_SOURCES = tst_psMetadata_05.c
+tst_psMetadata_06_SOURCES = tst_psMetadata_06.c
+tst_psMetadata_07_SOURCES = tst_psMetadata_07.c
+tst_psMetadataIO_SOURCES = tst_psMetadataIO.c
+tst_psPixels_SOURCES = tst_psPixels.c
 
 check_DATA =
Index: trunk/psLib/test/xml/Makefile.am
===================================================================
--- trunk/psLib/test/xml/Makefile.am	(revision 4549)
+++ trunk/psLib/test/xml/Makefile.am	(revision 4549)
@@ -0,0 +1,19 @@
+#Makefile for types tests
+#
+AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
+
+TESTS = 
+
+check_DATA =
+
+check_PROGRAMS = $(TESTS)
+
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
+
+EXTRA_DIST = verified
+
+CLEANFILES = $(TESTS) $(check_DATA)
+
+tests: $(check_DATA) $(TESTS)
+
+test: check