Fixes calligraphy tool so drawing now uses the the correct opacity.

[inkscape.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 73e6deb367d1a66e938c877a50ad947eac4d085a..c001b9b56d989654d2ba866f0680a567978d7226 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,6 +43,7 @@ include libnrtype/Makefile_insert
 include libavoid/Makefile_insert
 include livarot/Makefile_insert
 include removeoverlap/Makefile_insert
+include graphlayout/Makefile_insert
 include svg/Makefile_insert
 include utest/Makefile_insert
 include widgets/Makefile_insert
@@ -85,6 +86,7 @@ noinst_LIBRARIES =    \
        libavoid/libavoid.a     \
        livarot/libvarot.a      \
        removeoverlap/libremoveoverlap.a        \
+       graphlayout/libgraphlayout.a    \
        svg/libspsvg.a  \
        widgets/libspwidgets.a  \
        trace/libtrace.a  \
@@ -105,9 +107,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  \
@@ -164,13 +163,6 @@ EXTRA_PROGRAMS =   \
 
 TESTS =        \
        test-all$(EXEEXT)       \
-       attributes-test$(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)      \
@@ -199,13 +191,6 @@ TESTS =    \
 
 check_PROGRAMS =       \
        test-all        \
-       attributes-test \
-       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       \
@@ -234,16 +219,21 @@ test-all.cpp: \
                $(xml_test_xml_a_SOURCES)       \
                $(libnr_test_nr_includes)       \
                $(svg_test_svg_includes)        \
-               $(xml_test_xml_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --error-printer -root -o test-all.cpp       \
+               $(xml_test_xml_includes)        \
+               $(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)
+               $(xml_test_xml_includes)        \
+               $(test_all_includes)
 
 test_all_SOURCES = \
        test-all.cpp
 
+
 test_all_LDADD =       \
+       $(all_libs)     \
+       io/libio.a      \
        $(libnr_test_nr_LDADD)  \
        $(svg_test_svg_LDADD)   \
        $(xml_test_xml_LDADD)