X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=c6b58bce8ce7cfd6e141eb7f2929dc0fed215047;hb=7b51296159813ffbc382e4decef735f222ee23f8;hp=95ab6ce56e600e250836280a6938b94544430dd0;hpb=35c84109671f87daab292e3f10313842400e00b2;p=inkscape.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 95ab6ce56..c6b58bce8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,26 +18,29 @@ INCLUDES =	\
 	$(FREETYPE_CFLAGS)	\
 	$(GNOME_PRINT_CFLAGS)	\
 	$(GNOME_VFS_CFLAGS)	\
+	$(IMAGEMAGICK_CFLAGS) \
 	$(INKBOARD_CFLAGS) \
 	$(LIBWPG_CFLAGS) \
 	$(XFT_CFLAGS)	\
-	$(GTK_UNIX_PRINT_CFLAGS)	\
+	$(LCMS_CFLAGS)	\
 	$(POPPLER_CFLAGS)	\
 	$(POPPLER_GLIB_CFLAGS)	\
 	-DPOTRACE=\"potrace\"	\
 	$(INKSCAPE_CFLAGS) \
-	-I$(top_srcdir)/cxxtest
+	-I$(top_srcdir)/cxxtest \
+	$(WIN32_CFLAGS)
 
 include Makefile_insert
 include application/Makefile_insert
+include bind/Makefile_insert
 include dialogs/Makefile_insert
 include display/Makefile_insert
 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 filters/Makefile_insert
 include helper/Makefile_insert
 include inkjar/Makefile_insert
 include io/Makefile_insert
@@ -83,9 +86,10 @@ noinst_LIBRARIES =	\
 	dom/libdom.a	\
 	extension/implementation/libimplementation.a	\
 	extension/internal/libinternal.a	\
-	extension/internal/libwpg/libwpg.a	\
 	extension/libextension.a	\
 	extension/script/libscript.a	\
+	filters/libfilters.a	\
+	bind/libbind.a	\
 	helper/libspchelp.a	\
 	io/libio.a	\
 	libcroco/libcroco.a	\
@@ -116,9 +120,12 @@ noinst_LIBRARIES =	\
 	libinkpost.a
 
 check_LIBRARIES =	\
+	display/libtest-display.a	\
+	helper/libtest-helper.a	\
 	libnr/libtest-nr.a	\
 	svg/libtest-svg.a	\
 	svg/libtest-stubs.a	\
+	util/libtest-util.a	\
 	xml/libtest-xml.a
 
 DISTCLEANFILES =	\
@@ -131,6 +138,7 @@ EXTRA_DIST =	\
 	sp-skeleton.cpp sp-skeleton.h	\
 	algorithms/makefile.in	\
 	application/makefile.in	\
+	bind/makefile.in	\
 	debug/makefile.in	\
 	dialogs/makefile.in	\
 	dialogs/filedialog-win32.cpp	\
@@ -140,6 +148,7 @@ EXTRA_DIST =	\
 	extension/internal/makefile.in	\
 	extension/makefile.in	\
 	extension/script/makefile.in	\
+	filters/makefile.in \
 	helper/makefile.in	\
 	inkjar/makefile.in	\
 	io/makefile.in	\
@@ -169,8 +178,6 @@ EXTRA_DIST =	\
 	widgets/makefile.in	\
 	xml/makefile.in		\
 	2geom/makefile.in	\
-	extension/internal/gnome.cpp	\
-	extension/internal/gnome.h	\
 	extension/internal/win32.cpp	\
 	extension/internal/win32.h	\
 	extension/internal/emf-win32-inout.cpp	\
@@ -191,10 +198,12 @@ EXTRA_PROGRAMS =	\
 	libnr/testnr
 
 TESTS =	\
-	test-all$(EXEEXT)	\
+	test-src$(EXEEXT)	\
 	style-test$(EXEEXT)	\
 	display/bezier-utils-test$(EXEEXT)	\
+	display/test-display$(EXEEXT)	\
 	helper/units-test$(EXEEXT)	\
+	helper/test-helper$(EXEEXT)	\
 	libnr/in-svg-plane-test$(EXEEXT)	\
 	libnr/nr-matrix-test$(EXEEXT)	\
 	libnr/nr-point-fns-test$(EXEEXT)	\
@@ -206,14 +215,15 @@ TESTS =	\
 	libnr/test-nr$(EXEEXT)	\
 	svg/test-svg$(EXEEXT)	\
 	util/list-container-test$(EXEEXT)	\
+	util/test-util$(EXEEXT)	\
 	xml/test-xml$(EXEEXT)	\
 	xml/quote-test$(EXEEXT)	\
 	xml/repr-action-test$(EXEEXT)
 
 # As of 2007-01-13, these are failing...
-XFAIL_TESTS = \
-	test-all$(EXEEXT)	\
-	style-test$(EXEEXT)
+#XFAIL_TESTS = \
+#	test-src$(EXEEXT)	\
+#	style-test$(EXEEXT)
 
 # streamtest is unfinished and can't handle the relocations done during
 # "make distcheck".  Not needed for the 0.41 release.
@@ -223,10 +233,12 @@ XFAIL_TESTS = \
 # TESTS items can be scripts etc.
 
 check_PROGRAMS =	\
-	test-all	\
+	test-src	\
 	style-test	\
 	display/bezier-utils-test	\
+	display/test-display	\
 	helper/units-test	\
+	helper/test-helper	\
 	libnr/in-svg-plane-test	\
 	libnr/nr-matrix-test	\
 	libnr/nr-point-fns-test	\
@@ -238,6 +250,7 @@ check_PROGRAMS =	\
 	libnr/test-nr	\
 	svg/test-svg	\
 	util/list-container-test	\
+	util/test-util	\
 	xml/test-xml	\
 	xml/quote-test	\
 	xml/repr-action-test
@@ -245,29 +258,17 @@ check_PROGRAMS =	\
 #	io/streamtest
 
 
-test-all.cpp: \
-		$(libnr_test_nr_a_SOURCES)	\
-		$(svg_test_svg_a_SOURCES)	\
-		$(xml_test_xml_a_SOURCES)	\
-		$(libnr_test_nr_includes)	\
-		$(svg_test_svg_includes)	\
-		$(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)	\
-		$(test_all_includes)
+test-src.cpp: \
+		$(test_src_includes)
+		$(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh --template=$(srcdir)/selfname.tpl -root -o test-src.cpp	\
+		$(test_src_includes)
 
-test_all_SOURCES = \
-	test-all.cpp $(test_all_includes)
+test_src_SOURCES = \
+	test-src.cpp $(test_src_includes)
 
 
-test_all_LDADD =	\
+test_src_LDADD =	\
 	$(all_libs)	\
-	$(svg_test_svg_LDADD)	\
-	$(libnr_test_nr_LDADD)	\
-	$(xml_test_xml_LDADD) \
 	io/libio.a	
 
 
@@ -282,4 +283,4 @@ dist-hook:
 	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
+	rm -f display/test-display.xml display/test-display.log helper/test-helper.xml helper/test-helper.log libnr/test-nr.xml libnr/test-nr.log svg/test-svg.xml svg/test-svg.log util/test-util.xml util/test-util.log xml/test-xml.xml xml/test-xml.log test-src.xml test-src.log