X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=7c8115701396dd03d0a5edf08499d936f732a9ee;hb=7150f0829e7f5452f5cab605b8014a245f9b7e7c;hp=6ac221a1abad30406aec72c397a280081e04294c;hpb=0e39cdf0cc3195b77fa0effca0e2b07355fe1c0b;p=inkscape.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 6ac221a1a..7c8115701 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES =	\
 	$(FREETYPE_CFLAGS)	\
 	$(GNOME_PRINT_CFLAGS)	\
 	$(GNOME_VFS_CFLAGS)	\
-	$(LIBLOUDMOUTH_CFLAGS) \
+	$(INKBOARD_CFLAGS) \
 	$(XFT_CFLAGS)	\
 	-DPOTRACE=\"potrace\"	\
 	$(INKSCAPE_CFLAGS) \
@@ -32,16 +32,20 @@ include dom/Makefile_insert
 include extension/Makefile_insert
 include extension/implementation/Makefile_insert
 include extension/internal/Makefile_insert
+include extension/internal/libwpg/Makefile_insert
 include extension/script/Makefile_insert
 include helper/Makefile_insert
 include inkjar/Makefile_insert
 include io/Makefile_insert
+include pedro/Makefile_insert
 include jabber_whiteboard/Makefile_insert
 include libcroco/Makefile_insert
 include libnr/Makefile_insert
 include libnrtype/Makefile_insert
 include libavoid/Makefile_insert
 include livarot/Makefile_insert
+include libvpsc/Makefile_insert
+include libcola/Makefile_insert
 include removeoverlap/Makefile_insert
 include graphlayout/Makefile_insert
 include svg/Makefile_insert
@@ -64,11 +68,13 @@ noinst_LIBRARIES =	\
 	libinkpre.a	\
 	application/libinkapp.a	\
 	dialogs/libspdialogs.a	\
+	pedro/libpedro.a \
 	jabber_whiteboard/libjabber_whiteboard.a \
 	display/libspdisplay.a	\
 	dom/libdom.a	\
 	extension/implementation/libimplementation.a	\
 	extension/internal/libinternal.a	\
+	extension/internal/libwpg/libwpg.a	\
 	extension/libextension.a	\
 	extension/script/libscript.a	\
 	helper/libspchelp.a	\
@@ -84,6 +90,8 @@ noinst_LIBRARIES =	\
 	libnr/libnr.a	\
 	libnrtype/libnrtype.a	\
 	libavoid/libavoid.a	\
+	libvpsc/libvpsc.a	\
+	libcola/libcola.a	\
 	livarot/libvarot.a	\
 	removeoverlap/libremoveoverlap.a	\
 	graphlayout/libgraphlayout.a	\
@@ -107,9 +115,6 @@ EXTRA_DIST =	\
 	mkdep.pl	\
 	mkfiles.pl	\
 	make.exclude	\
-	make.dep	\
-	make.files	\
-	make.ofiles	\
 	Doxyfile	\
 	sp-skeleton.cpp sp-skeleton.h	\
 	algorithms/makefile.in	\
@@ -122,13 +127,13 @@ EXTRA_DIST =	\
 	extension/implementation/makefile.in	\
 	extension/internal/makefile.in	\
 	extension/makefile.in	\
-	extension/plugin/makefile.in	\
 	extension/script/makefile.in	\
 	helper/makefile.in	\
 	inkjar/makefile.in	\
 	io/makefile.in	\
 	io/crystalegg.xml	\
 	io/doc2html.xsl 	\
+	pedro/makefile.in	\
 	jabber_whiteboard/makefile.in	\
 	libcroco/makefile.in	\
 	libnr/makefile.in	\
@@ -166,13 +171,6 @@ EXTRA_PROGRAMS =	\
 
 TESTS =	\
 	test-all$(EXEEXT)	\
-	attributes-test$(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)	\
@@ -185,7 +183,6 @@ TESTS =	\
 	libnr/nr-translate-test$(EXEEXT)	\
 	libnr/nr-types-test$(EXEEXT)	\
 	libnr/test-nr$(EXEEXT)	\
-	removeoverlap/remove_rectangle_overlap-test$(EXEEXT)	\
 	svg/test-svg$(EXEEXT)	\
 	util/list-container-test$(EXEEXT)	\
 	xml/test-xml$(EXEEXT)	\
@@ -201,13 +198,6 @@ TESTS =	\
 
 check_PROGRAMS =	\
 	test-all	\
-	attributes-test	\
-	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	\
@@ -220,7 +210,6 @@ check_PROGRAMS =	\
 	libnr/nr-translate-test	\
 	libnr/nr-types-test	\
 	libnr/test-nr	\
-	removeoverlap/remove_rectangle_overlap-test	\
 	svg/test-svg	\
 	util/list-container-test	\
 	xml/test-xml	\
@@ -236,19 +225,24 @@ test-all.cpp: \
 		$(xml_test_xml_a_SOURCES)	\
 		$(libnr_test_nr_includes)	\
 		$(svg_test_svg_includes)	\
-		$(xml_test_xml_includes)
-	$(top_srcdir)/cxxtest/cxxtestgen.pl --error-printer -root -o test-all.cpp	\
+		$(xml_test_xml_includes)	\
+		$(test_all_includes)
+	$(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o test-all.cpp	\
 		$(libnr_test_nr_includes)	\
 		$(svg_test_svg_includes)	\
-		$(xml_test_xml_includes)
+		$(xml_test_xml_includes)	\
+		$(test_all_includes)
 
 test_all_SOURCES = \
-	test-all.cpp
+	test-all.cpp $(test_all_includes)
+
 
 test_all_LDADD =	\
-	$(libnr_test_nr_LDADD)	\
+	$(all_libs)	\
 	$(svg_test_svg_LDADD)	\
-	$(xml_test_xml_LDADD)
+	$(libnr_test_nr_LDADD)	\
+	$(xml_test_xml_LDADD) \
+	io/libio.a	
 
 
 # ################################################
@@ -261,3 +255,5 @@ dist-hook:
 	mkdir $(distdir)/pixmaps
 	cp $(srcdir)/pixmaps/*xpm $(distdir)/pixmaps
 
+distclean-local:
+	rm -f libnr/test-nr.xml libnr/test-nr.log svg/test-svg.xml svg/test-svg.log xml/test-xml.xml xml/test-xml.log test-all.xml test-all.log