summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2009-09-28 02:56:30 +0000
committergouldtj <gouldtj@users.sourceforge.net>2009-09-28 02:56:30 +0000
commit520dabb2a80e0ad52eb3ee160b9873c5ea5e4d9e (patch)
tree4f0f16e9679c13199bc8286ec5e630c82c6c120b /src
parentRemoving the "1"s from the whiteboard related undefs (buildtool related). (diff)
downloadinkscape-520dabb2a80e0ad52eb3ee160b9873c5ea5e4d9e.tar.gz
inkscape-520dabb2a80e0ad52eb3ee160b9873c5ea5e4d9e.zip
Merging in build changes from the 0.47pre3 release
(bzr r8664)
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am5
1 files changed, 3 insertions, 2 deletions
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)