Rearrange to enable code that does not directly rely on lcms.

[inkscape.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 09e52576bf58f350c1ca2c7c83c0a88b9e156108..c6b58bce8ce7cfd6e141eb7f2929dc0fed215047 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,8 @@ INCLUDES =    \
        $(POPPLER_GLIB_CFLAGS)  \
        -DPOTRACE=\"potrace\"   \
        $(INKSCAPE_CFLAGS) \
-       -I$(top_srcdir)/cxxtest
+       -I$(top_srcdir)/cxxtest \
+       $(WIN32_CFLAGS)
 
 include Makefile_insert
 include application/Makefile_insert
@@ -39,6 +40,7 @@ include extension/Makefile_insert
 include extension/implementation/Makefile_insert
 include extension/internal/Makefile_insert
 include extension/script/Makefile_insert
+include filters/Makefile_insert
 include helper/Makefile_insert
 include inkjar/Makefile_insert
 include io/Makefile_insert
@@ -86,6 +88,7 @@ noinst_LIBRARIES =    \
        extension/internal/libinternal.a        \
        extension/libextension.a        \
        extension/script/libscript.a    \
+       filters/libfilters.a    \
        bind/libbind.a  \
        helper/libspchelp.a     \
        io/libio.a      \
@@ -145,6 +148,7 @@ EXTRA_DIST =        \
        extension/internal/makefile.in  \
        extension/makefile.in   \
        extension/script/makefile.in    \
+       filters/makefile.in \
        helper/makefile.in      \
        inkjar/makefile.in      \
        io/makefile.in  \
@@ -256,7 +260,7 @@ check_PROGRAMS =    \
 
 test-src.cpp: \
                $(test_src_includes)
-               $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o test-src.cpp     \
+               $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh --template=$(srcdir)/selfname.tpl -root -o test-src.cpp   \
                $(test_src_includes)
 
 test_src_SOURCES = \