X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=6155568a23bd141a1d12e5385da0b2021acee91c;hb=2c9c6838241516364d68db0d30520e18f70fc70d;hp=cf10338813673c594eb7d96d6af4e325a415427c;hpb=b369d1baead1128379ecab2ee74d2765c24fffb7;p=inkscape.git

diff --git a/src/Makefile.am b/src/Makefile.am
index cf1033881..6155568a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -166,12 +166,6 @@ EXTRA_PROGRAMS =	\
 
 TESTS =	\
 	test-all$(EXEEXT)	\
-	dir-util-test$(EXEEXT)	\
-	extract-uri-test$(EXEEXT)	\
-	mod360-test$(EXEEXT)	\
-	round-test$(EXEEXT)	\
-	sp-gradient-test$(EXEEXT)	\
-	sp-style-elem-test$(EXEEXT)	\
 	style-test$(EXEEXT)	\
 	display/bezier-utils-test$(EXEEXT)	\
 	helper/units-test$(EXEEXT)	\
@@ -200,12 +194,6 @@ TESTS =	\
 
 check_PROGRAMS =	\
 	test-all	\
-	dir-util-test	\
-	extract-uri-test	\
-	mod360-test	\
-	round-test	\
-	sp-gradient-test	\
-	sp-style-elem-test	\
 	style-test	\
 	display/bezier-utils-test	\
 	helper/units-test	\
@@ -235,19 +223,20 @@ test-all.cpp: \
 		$(libnr_test_nr_includes)	\
 		$(svg_test_svg_includes)	\
 		$(xml_test_xml_includes)	\
-		attributes-test.h
-	$(top_srcdir)/cxxtest/cxxtestgen.pl --error-printer -root -o test-all.cpp	\
+		$(test_all_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=selfname.tpl -root -o test-all.cpp	\
 		$(libnr_test_nr_includes)	\
 		$(svg_test_svg_includes)	\
 		$(xml_test_xml_includes)	\
-		attributes-test.h
+		$(test_all_includes)
 
 test_all_SOURCES = \
 	test-all.cpp
 
 
 test_all_LDADD =	\
-	libinkpre.a	\
+	$(all_libs)	\
+	io/libio.a	\
 	$(libnr_test_nr_LDADD)	\
 	$(svg_test_svg_LDADD)	\
 	$(xml_test_xml_LDADD)