diff --git a/src/Makefile.am b/src/Makefile.am
index 517e89f1afd8e4057eb395810ce470af0492557c..63b27398afd27db6e97dd9ce2081d98ed472d941 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
# Libraries which should be compiled by "make" but not installed.
# Use this only for libraries that are really standalone, rather than for
# source tree subdirectories.
-if WITH_INKBOARD
-libpedro = pedro/libpedro.a
-endif
+#if WITH_INKBOARD
+#libpedro = pedro/libpedro.a
+#endif
noinst_LIBRARIES = \
libinkscape.a \
dom/libdom.a \
include helper/Makefile_insert
include inkjar/Makefile_insert
include io/Makefile_insert
-include pedro/Makefile_insert
-include jabber_whiteboard/Makefile_insert
+#include pedro/Makefile_insert
+#include jabber_whiteboard/Makefile_insert
include libcroco/Makefile_insert
include libgdl/Makefile_insert
include libnr/Makefile_insert
traits/function.h \
traits/list-copy.h \
traits/reference.h \
- $(jabber_whiteboard_SOURCES)
+ show-preview.bmp \
+ $(jabber_whiteboard_SOURCES) \
+ $(CXXTEST_TEMPLATE)
# Extra files to remove when doing "make distclean"
DISTCLEANFILES = \
inkscape-version.cpp: $(inkscape_version_deps)
VER_PREFIX="$(VERSION)"; \
if test -x "$(srcdir)/.svn" -a ! -z `which svn`; then \
- VER_SVNREV=" r`svn info $(srcdir) | sed -n -e '/^Revision:/s/Revision: \(.*\)/\1/p'`"; \
+ VER_SVNREV=" r`LANG=en svn info $(srcdir) | sed -n -e '/^Revision:/s/Revision: \(.*\)/\1/p'`"; \
if test ! -z "`svn status -q $(srcdir)`"; then \
VER_CUSTOM=" custom"; \
fi; \
# "make distcheck".
# List of all tests to be run.
-TESTS = $(check_PROGRAMS)
+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 $(ink_common_sources)
+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)