fix bug #1568462 boolean operation remove mask/clip-path

[inkscape.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6155568a23bd141a1d12e5385da0b2021acee91c..7c8115701396dd03d0a5edf08499d936f732a9ee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES =    \
        $(FREETYPE_CFLAGS)      \
        $(GNOME_PRINT_CFLAGS)   \
        $(GNOME_VFS_CFLAGS)     \
-       $(LIBLOUDMOUTH_CFLAGS) \
+       $(INKBOARD_CFLAGS) \
        $(XFT_CFLAGS)   \
        -DPOTRACE=\"potrace\"   \
        $(INKSCAPE_CFLAGS) \
@@ -32,16 +32,20 @@ include dom/Makefile_insert
 include extension/Makefile_insert
 include extension/implementation/Makefile_insert
 include extension/internal/Makefile_insert
+include extension/internal/libwpg/Makefile_insert
 include extension/script/Makefile_insert
 include helper/Makefile_insert
 include inkjar/Makefile_insert
 include io/Makefile_insert
+include pedro/Makefile_insert
 include jabber_whiteboard/Makefile_insert
 include libcroco/Makefile_insert
 include libnr/Makefile_insert
 include libnrtype/Makefile_insert
 include libavoid/Makefile_insert
 include livarot/Makefile_insert
+include libvpsc/Makefile_insert
+include libcola/Makefile_insert
 include removeoverlap/Makefile_insert
 include graphlayout/Makefile_insert
 include svg/Makefile_insert
@@ -64,11 +68,13 @@ noinst_LIBRARIES =  \
        libinkpre.a     \
        application/libinkapp.a \
        dialogs/libspdialogs.a  \
+       pedro/libpedro.a \
        jabber_whiteboard/libjabber_whiteboard.a \
        display/libspdisplay.a  \
        dom/libdom.a    \
        extension/implementation/libimplementation.a    \
        extension/internal/libinternal.a        \
+       extension/internal/libwpg/libwpg.a      \
        extension/libextension.a        \
        extension/script/libscript.a    \
        helper/libspchelp.a     \
@@ -84,6 +90,8 @@ noinst_LIBRARIES =    \
        libnr/libnr.a   \
        libnrtype/libnrtype.a   \
        libavoid/libavoid.a     \
+       libvpsc/libvpsc.a       \
+       libcola/libcola.a       \
        livarot/libvarot.a      \
        removeoverlap/libremoveoverlap.a        \
        graphlayout/libgraphlayout.a    \
@@ -107,9 +115,6 @@ EXTRA_DIST =        \
        mkdep.pl        \
        mkfiles.pl      \
        make.exclude    \
-       make.dep        \
-       make.files      \
-       make.ofiles     \
        Doxyfile        \
        sp-skeleton.cpp sp-skeleton.h   \
        algorithms/makefile.in  \
@@ -122,13 +127,13 @@ EXTRA_DIST =      \
        extension/implementation/makefile.in    \
        extension/internal/makefile.in  \
        extension/makefile.in   \
-       extension/plugin/makefile.in    \
        extension/script/makefile.in    \
        helper/makefile.in      \
        inkjar/makefile.in      \
        io/makefile.in  \
        io/crystalegg.xml       \
        io/doc2html.xsl         \
+       pedro/makefile.in       \
        jabber_whiteboard/makefile.in   \
        libcroco/makefile.in    \
        libnr/makefile.in       \
@@ -178,7 +183,6 @@ TESTS =     \
        libnr/nr-translate-test$(EXEEXT)        \
        libnr/nr-types-test$(EXEEXT)    \
        libnr/test-nr$(EXEEXT)  \
-       removeoverlap/remove_rectangle_overlap-test$(EXEEXT)    \
        svg/test-svg$(EXEEXT)   \
        util/list-container-test$(EXEEXT)       \
        xml/test-xml$(EXEEXT)   \
@@ -206,7 +210,6 @@ check_PROGRAMS =    \
        libnr/nr-translate-test \
        libnr/nr-types-test     \
        libnr/test-nr   \
-       removeoverlap/remove_rectangle_overlap-test     \
        svg/test-svg    \
        util/list-container-test        \
        xml/test-xml    \
@@ -224,22 +227,22 @@ test-all.cpp: \
                $(svg_test_svg_includes)        \
                $(xml_test_xml_includes)        \
                $(test_all_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=selfname.tpl -root -o test-all.cpp       \
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o test-all.cpp     \
                $(libnr_test_nr_includes)       \
                $(svg_test_svg_includes)        \
                $(xml_test_xml_includes)        \
                $(test_all_includes)
 
 test_all_SOURCES = \
-       test-all.cpp
+       test-all.cpp $(test_all_includes)
 
 
 test_all_LDADD =       \
        $(all_libs)     \
-       io/libio.a      \
-       $(libnr_test_nr_LDADD)  \
        $(svg_test_svg_LDADD)   \
-       $(xml_test_xml_LDADD)
+       $(libnr_test_nr_LDADD)  \
+       $(xml_test_xml_LDADD) \
+       io/libio.a      
 
 
 # ################################################
@@ -252,3 +255,5 @@ dist-hook:
        mkdir $(distdir)/pixmaps
        cp $(srcdir)/pixmaps/*xpm $(distdir)/pixmaps
 
+distclean-local:
+       rm -f libnr/test-nr.xml libnr/test-nr.log svg/test-svg.xml svg/test-svg.log xml/test-xml.xml xml/test-xml.log test-all.xml test-all.log