revert the PS rotation part of Adrian's patch for 437550, see discussion in the bug

[inkscape.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cb6e1b9030d58814cbcf340241b73d287b198ec4..63b27398afd27db6e97dd9ce2081d98ed472d941 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,9 +16,9 @@ bin_PROGRAMS = inkscape inkview
 # 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            \
@@ -111,8 +111,8 @@ include filters/Makefile_insert
 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
@@ -195,7 +195,9 @@ EXTRA_DIST =        \
        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 =       \
@@ -264,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)