finally getting closer to processing axes and contexts correctly

[inkscape.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cf10338813673c594eb7d96d6af4e325a415427c..090b4c683e3d9d27005b3bfe70ac64cc16b360c8 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) \
@@ -36,6 +36,7 @@ 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
@@ -64,6 +65,7 @@ noinst_LIBRARIES =    \
        libinkpre.a     \
        application/libinkapp.a \
        dialogs/libspdialogs.a  \
+       pedro/libpedro.a \
        jabber_whiteboard/libjabber_whiteboard.a \
        display/libspdisplay.a  \
        dom/libdom.a    \
@@ -107,9 +109,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  \
@@ -129,6 +128,7 @@ EXTRA_DIST =        \
        io/makefile.in  \
        io/crystalegg.xml       \
        io/doc2html.xsl         \
+       pedro/makefile.in       \
        jabber_whiteboard/makefile.in   \
        libcroco/makefile.in    \
        libnr/makefile.in       \
@@ -166,12 +166,6 @@ EXTRA_PROGRAMS =   \
 
 TESTS =        \
        test-all$(EXEEXT)       \
-       dir-util-test$(EXEEXT)  \
-       extract-uri-test$(EXEEXT)       \
-       mod360-test$(EXEEXT)    \
-       round-test$(EXEEXT)     \
-       sp-gradient-test$(EXEEXT)       \
-       sp-style-elem-test$(EXEEXT)     \
        style-test$(EXEEXT)     \
        display/bezier-utils-test$(EXEEXT)      \
        helper/units-test$(EXEEXT)      \
@@ -200,12 +194,6 @@ TESTS =    \
 
 check_PROGRAMS =       \
        test-all        \
-       dir-util-test   \
-       extract-uri-test        \
-       mod360-test     \
-       round-test      \
-       sp-gradient-test        \
-       sp-style-elem-test      \
        style-test      \
        display/bezier-utils-test       \
        helper/units-test       \
@@ -235,22 +223,23 @@ test-all.cpp: \
                $(libnr_test_nr_includes)       \
                $(svg_test_svg_includes)        \
                $(xml_test_xml_includes)        \
-               attributes-test.h
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --error-printer -root -o test-all.cpp       \
+               $(test_all_includes)
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=selfname.tpl -root -o test-all.cpp       \
                $(libnr_test_nr_includes)       \
                $(svg_test_svg_includes)        \
                $(xml_test_xml_includes)        \
-               attributes-test.h
+               $(test_all_includes)
 
 test_all_SOURCES = \
-       test-all.cpp
+       test-all.cpp $(test_all_includes)
 
 
 test_all_LDADD =       \
-       libinkpre.a     \
-       $(libnr_test_nr_LDADD)  \
+       $(all_libs)     \
        $(svg_test_svg_LDADD)   \
-       $(xml_test_xml_LDADD)
+       $(libnr_test_nr_LDADD)  \
+       $(xml_test_xml_LDADD) \
+       io/libio.a      
 
 
 # ################################################
@@ -263,3 +252,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