When selecting 'none', the marker wasn't getting removed from the line.

[inkscape.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6358d35dda637de52d850a3e77131beccfacb562..644ff8ae7240275f9d30c14ee51a32e9bf5d21f1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,6 +20,7 @@ INCLUDES =    \
        $(GNOME_VFS_CFLAGS)     \
        $(INKBOARD_CFLAGS) \
        $(XFT_CFLAGS)   \
+       $(GTK_UNIX_PRINT_CFLAGS)        \
        -DPOTRACE=\"potrace\"   \
        $(INKSCAPE_CFLAGS) \
        -I$(top_srcdir)/cxxtest
@@ -32,6 +33,7 @@ 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
@@ -55,6 +57,7 @@ include xml/Makefile_insert
 include traits/Makefile_insert
 include algorithms/Makefile_insert
 include ui/Makefile_insert
+include ui/cache/Makefile_insert
 include ui/dialog/Makefile_insert
 include ui/view/Makefile_insert
 include ui/widget/Makefile_insert
@@ -73,12 +76,14 @@ noinst_LIBRARIES =  \
        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     \
        io/libio.a      \
        libcroco/libcroco.a     \
        ui/libui.a      \
+       ui/cache/libuicache.a   \
        ui/dialog/libuidialog.a \
        ui/view/libuiview.a     \
        ui/widget/libuiwidget.a \
@@ -102,6 +107,7 @@ noinst_LIBRARIES =  \
 check_LIBRARIES =      \
        libnr/libtest-nr.a      \
        svg/libtest-svg.a       \
+       svg/libtest-stubs.a     \
        xml/libtest-xml.a
 
 DISTCLEANFILES =       \
@@ -125,7 +131,6 @@ 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      \
@@ -145,6 +150,7 @@ EXTRA_DIST =        \
        traits/makefile.in      \
        utest/makefile.in       \
        ui/makefile.in          \
+       ui/cache/makefile.in    \
        ui/dialog/makefile.in   \
        ui/view/makefile.in     \
        ui/widget/makefile.in   \
@@ -155,6 +161,10 @@ EXTRA_DIST =       \
        extension/internal/gnome.h      \
        extension/internal/win32.cpp    \
        extension/internal/win32.h      \
+       extension/internal/emf-win32-inout.cpp  \
+       extension/internal/emf-win32-inout.h    \
+       extension/internal/emf-win32-print.cpp  \
+       extension/internal/emf-win32-print.h    \
        helper/sp-marshal.list  \
        utest/utest.h   \
        utest/test-1ary-cases.h \
@@ -182,13 +192,17 @@ 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)   \
        xml/quote-test$(EXEEXT) \
        xml/repr-action-test$(EXEEXT)
 
+# As of 2007-01-13, these are failing...
+XFAIL_TESTS = \
+       test-all$(EXEEXT)       \
+       style-test$(EXEEXT)
+
 # streamtest is unfinished and can't handle the relocations done during
 # "make distcheck".  Not needed for the 0.41 release.
 #      io/streamtest$(EXEEXT)
@@ -210,7 +224,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    \
@@ -228,7 +241,7 @@ 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)        \