X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=7e6cd1f263ded0a0f3dabdf03cc23cc46b8bb987;hb=b7d95f994b4858eeab9ce480b04933b5e94d40eb;hp=6155568a23bd141a1d12e5385da0b2021acee91c;hpb=29c54358e58809867ecea08ad077d54cf7208e8a;p=inkscape.git diff --git a/src/Makefile.am b/src/Makefile.am index 6155568a2..7e6cd1f26 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,8 +18,11 @@ INCLUDES = \ $(FREETYPE_CFLAGS) \ $(GNOME_PRINT_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ - $(LIBLOUDMOUTH_CFLAGS) \ + $(INKBOARD_CFLAGS) \ $(XFT_CFLAGS) \ + $(GTK_UNIX_PRINT_CFLAGS) \ + $(POPPLER_CFLAGS) \ + $(POPPLER_GLIB_CFLAGS) \ -DPOTRACE=\"potrace\" \ $(INKSCAPE_CFLAGS) \ -I$(top_srcdir)/cxxtest @@ -32,16 +35,23 @@ 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 libgdl/Makefile_insert include libnr/Makefile_insert include libnrtype/Makefile_insert include libavoid/Makefile_insert include livarot/Makefile_insert +include live_effects/Makefile_insert +include live_effects/parameter/Makefile_insert +include libvpsc/Makefile_insert +include libcola/Makefile_insert include removeoverlap/Makefile_insert include graphlayout/Makefile_insert include svg/Makefile_insert @@ -52,11 +62,13 @@ 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 include util/Makefile_insert include trace/Makefile_insert +include 2geom/Makefile_insert bin_PROGRAMS = inkscape inkview @@ -64,17 +76,23 @@ 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 \ io/libio.a \ libcroco/libcroco.a \ + libgdl/libgdl.a \ + live_effects/liblive_effects.a \ + live_effects/parameter/liblpeparam.a \ ui/libui.a \ + ui/cache/libuicache.a \ ui/dialog/libuidialog.a \ ui/view/libuiview.a \ ui/widget/libuiwidget.a \ @@ -84,6 +102,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 \ @@ -91,11 +111,13 @@ noinst_LIBRARIES = \ widgets/libspwidgets.a \ trace/libtrace.a \ xml/libspxml.a \ + 2geom/lib2geom.a \ libinkpost.a check_LIBRARIES = \ libnr/libtest-nr.a \ svg/libtest-svg.a \ + svg/libtest-stubs.a \ xml/libtest-xml.a DISTCLEANFILES = \ @@ -104,12 +126,6 @@ DISTCLEANFILES = \ inkscape_version.h 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,35 +138,44 @@ 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 \ + libgdl/makefile.in \ libcroco/makefile.in \ libnr/makefile.in \ libnrtype/makefile.in \ libavoid/makefile.in \ livarot/makefile.in \ + live_effects/makefile.in \ + live_effects/parameter/makefile.in \ removeoverlap/makefile.in \ svg/makefile.in \ trace/makefile.in \ 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 \ util/makefile.in \ widgets/makefile.in \ xml/makefile.in \ + 2geom/makefile.in \ extension/internal/gnome.cpp \ 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 \ @@ -178,13 +203,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) @@ -206,7 +235,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 +252,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 +280,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