Index: trunk/psLib/test/xml/Makefile.am
===================================================================
--- trunk/psLib/test/xml/Makefile.am	(revision 7998)
+++ trunk/psLib/test/xml/Makefile.am	(revision 8718)
@@ -1,24 +1,14 @@
-#Makefile for types tests
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -DSRCDIR=\"$(srcdir)\"
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-    tst_psXML
+check_PROGRAMS =
 
-tst_psXML_SOURCES = tst_psXML.c
+EXTRA_DIST = psTime.xml psTime2.xml psTime3.xml psTime4.xml
 
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_DIST = verified psTime.xml psTime2.xml psTime3.xml psTime4.xml
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* psTest5.xml psTest2.xml psTest.xml psTest3.xml psTest4.xml \
+CLEANFILES = $(check_DATA) temp/* psTest5.xml psTest2.xml psTest.xml psTest3.xml psTest4.xml \
 	core core.* *~ *.bb *.bbg *.da gmon.out
 
-tests: $(check_DATA) $(TESTS)
-
 test: check