diff options
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 667ebef4e..3350f2438 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -82,8 +82,6 @@ AM_CPPFLAGS = \ $(INKSCAPE_CFLAGS) \ -I$(top_srcdir)/cxxtest \ $(WIN32_CFLAGS) \ - -I$(srcdir)/bind/javainc \ - -I$(srcdir)/bind/javainc/linux \ -I$(builddir)/extension/dbus \ $(X11_CFLAGS) @@ -107,7 +105,6 @@ endif # Include all partial makefiles from subdirectories include Makefile_insert -include bind/Makefile_insert include dialogs/Makefile_insert include display/Makefile_insert include dom/Makefile_insert @@ -115,7 +112,6 @@ include extension/Makefile_insert include extension/dbus/Makefile_insert include extension/implementation/Makefile_insert include extension/internal/Makefile_insert -include extension/script/Makefile_insert include filters/Makefile_insert include helper/Makefile_insert include io/Makefile_insert @@ -148,7 +144,6 @@ EXTRA_DIST += \ $(top_srcdir)/Doxyfile \ sp-skeleton.cpp sp-skeleton.h \ util/makefile.in \ - bind/makefile.in \ debug/makefile.in \ dialogs/makefile.in \ display/makefile.in \ @@ -156,7 +151,6 @@ EXTRA_DIST += \ extension/implementation/makefile.in \ extension/internal/makefile.in \ extension/makefile.in \ - extension/script/makefile.in \ filters/makefile.in \ helper/makefile.in \ io/makefile.in \ @@ -255,7 +249,18 @@ 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 + +# FIXME: Currently, a number of cxxtest tests fail. These should be fixed and +# the XFAIL_TESTS build target should be removed. +# See the following Launchpad bugs: +# +# LP #1202271 <cxxtest: preferences-test.h fails> +# LP #1208013 <cxxtest: curve-test.h fails> +# LP #1208002 <cxxtest: svg-length-test.h fails> +# LP #1208005 <cxxtest: svg-path-geom-test.h fails> +# LP #1207502 <cxxtest: svg-affine-test.h fails> + +XFAIL_TESTS = $(check_PROGRAMS) # including the the testsuites here ensures that they get distributed cxxtests_SOURCES = cxxtests.cpp $(CXXTEST_TESTSUITES) |