From 8ec8d5d0c82b02919f1fbadee701997eb5d76e5e Mon Sep 17 00:00:00 2001
From: gouldtj <gouldtj@users.sourceforge.net>
Date: Mon, 28 Sep 2009 02:56:30 +0000
Subject: [PATCH] Merging in build changes from the 0.47pre3 release

---
 Makefile.am                       |  1 -
 share/extensions/test/Makefile.am | 57 ++++++++++++++++++++++++++++++-
 src/Makefile.am                   |  5 +--
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 70a3f9cff..e33d27150 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,7 +123,6 @@ EXTRA_DIST = \
 	packaging/macosx/Resources/bin/inkscape	\
 	packaging/macosx/Resources/etc/fonts/fonts.conf	\
 	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh \
 	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png \
 	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png \
 	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png \
diff --git a/share/extensions/test/Makefile.am b/share/extensions/test/Makefile.am
index 64a0b6600..eb63f357b 100644
--- a/share/extensions/test/Makefile.am
+++ b/share/extensions/test/Makefile.am
@@ -1,4 +1,59 @@
 
 # List of all tests to be run.
 #TESTS = svgcalendar.test.py
-# that is not working :-/
\ No newline at end of file
+# that is not working :-/
+
+EXTRA_DIST = \
+		addnodes.test.py \
+		chardataeffect.test.py \
+		coloreffect.test.py \
+		create_test_from_template.sh \
+		dots.test.py \
+		draw_from_triangle.test.py \
+		dxf_outlines.test.py \
+		edge3d.test.py \
+		embedimage.test.py \
+		eqtexsvg.test.py \
+		extractimage.test.py \
+		extrude.test.py \
+		flatten.test.py \
+		foldablebox.test.py \
+		fractalize.test.py \
+		funcplot.test.py \
+		gears.test.py \
+		gimp_xcf.test.py \
+		grid_cartesian.test.py \
+		grid_polar.test.py \
+		guides_creator.test.py \
+		handles.test.py \
+		hpgl_output.test.py \
+		inkweb-debug.js \
+		inkwebeffect.test.py \
+		inkwebjs-move.test.svg \
+		interp_att_g.test.py \
+		interp.test.py \
+		lindenmayer.test.py \
+		lorem_ipsum.test.py \
+		markers_strokepaint.test.py \
+		measure.test.py \
+		minimal-blank.svg \
+		motion.test.py \
+		pathmodifier.test.py \
+		perfectboundcover.test.py \
+		perspective.test.py \
+		polyhedron_3d.test.py \
+		printing-marks.test.py \
+		radiusrand.test.py \
+		render_alphabetsoup.test.py \
+		render_barcode.test.py \
+		restack.test.py \
+		rtree.test.py \
+		run-all-extension-tests \
+		spirograph.test.py \
+		straightseg.test.py \
+		summersnight.test.py \
+		svg_and_media_zip_output.test.py \
+		svgcalendar.test.py \
+		test_template.py.txt \
+		triangle.test.py \
+		whirl.test.py
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d57de850..63b27398a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -266,10 +266,11 @@ check_PROGRAMS = cxxtests
 
 # List of all tests to be run.
 TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests
+# XFAIL_TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests
 
 # including the the testsuites here ensures that they get distributed
-cxxtests_SOURCES = cxxtests.cpp $(CXXTEST_TESTSUITES)
-cxxtests_LDADD = libnr/nr-compose-reference.o $(all_libs)
+cxxtests_SOURCES = cxxtests.cpp libnr/nr-compose-reference.cpp $(CXXTEST_TESTSUITES)
+cxxtests_LDADD = $(all_libs)
 
 cxxtests.cpp: $(CXXTEST_TESTSUITES) $(CXXTEST_TEMPLATE)
 	$(CXXTESTGEN) -o cxxtests.cpp $(CXXTEST_TESTSUITES)
-- 
2.30.2