X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=c6b58bce8ce7cfd6e141eb7f2929dc0fed215047;hb=7b51296159813ffbc382e4decef735f222ee23f8;hp=73e6deb367d1a66e938c877a50ad947eac4d085a;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git diff --git a/src/Makefile.am b/src/Makefile.am index 73e6deb36..c6b58bce8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,14 +18,21 @@ INCLUDES = \ $(FREETYPE_CFLAGS) \ $(GNOME_PRINT_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ - $(LIBLOUDMOUTH_CFLAGS) \ + $(IMAGEMAGICK_CFLAGS) \ + $(INKBOARD_CFLAGS) \ + $(LIBWPG_CFLAGS) \ $(XFT_CFLAGS) \ + $(LCMS_CFLAGS) \ + $(POPPLER_CFLAGS) \ + $(POPPLER_GLIB_CFLAGS) \ -DPOTRACE=\"potrace\" \ $(INKSCAPE_CFLAGS) \ - -I$(top_srcdir)/cxxtest + -I$(top_srcdir)/cxxtest \ + $(WIN32_CFLAGS) include Makefile_insert include application/Makefile_insert +include bind/Makefile_insert include dialogs/Makefile_insert include display/Makefile_insert include dom/Makefile_insert @@ -33,16 +40,24 @@ 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 +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 include utest/Makefile_insert include widgets/Makefile_insert @@ -51,11 +66,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 @@ -63,6 +80,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 \ @@ -70,10 +88,16 @@ 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 \ 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 \ @@ -83,17 +107,25 @@ 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 \ svg/libspsvg.a \ widgets/libspwidgets.a \ trace/libtrace.a \ xml/libspxml.a \ + 2geom/lib2geom.a \ libinkpost.a check_LIBRARIES = \ + display/libtest-display.a \ + helper/libtest-helper.a \ libnr/libtest-nr.a \ svg/libtest-svg.a \ + svg/libtest-stubs.a \ + util/libtest-util.a \ xml/libtest-xml.a DISTCLEANFILES = \ @@ -102,16 +134,11 @@ 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 \ application/makefile.in \ + bind/makefile.in \ debug/makefile.in \ dialogs/makefile.in \ dialogs/filedialog-win32.cpp \ @@ -120,35 +147,43 @@ EXTRA_DIST = \ extension/implementation/makefile.in \ extension/internal/makefile.in \ extension/makefile.in \ - extension/plugin/makefile.in \ extension/script/makefile.in \ + filters/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 \ - extension/internal/gnome.cpp \ - extension/internal/gnome.h \ + 2geom/makefile.in \ 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 \ @@ -163,17 +198,12 @@ EXTRA_PROGRAMS = \ libnr/testnr 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) \ + test-src$(EXEEXT) \ style-test$(EXEEXT) \ display/bezier-utils-test$(EXEEXT) \ + display/test-display$(EXEEXT) \ helper/units-test$(EXEEXT) \ + helper/test-helper$(EXEEXT) \ libnr/in-svg-plane-test$(EXEEXT) \ libnr/nr-matrix-test$(EXEEXT) \ libnr/nr-point-fns-test$(EXEEXT) \ @@ -183,13 +213,18 @@ 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) \ + util/test-util$(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-src$(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) @@ -198,17 +233,12 @@ TESTS = \ # TESTS items can be scripts etc. check_PROGRAMS = \ - test-all \ - attributes-test \ - dir-util-test \ - extract-uri-test \ - mod360-test \ - round-test \ - sp-gradient-test \ - sp-style-elem-test \ + test-src \ style-test \ display/bezier-utils-test \ + display/test-display \ helper/units-test \ + helper/test-helper \ libnr/in-svg-plane-test \ libnr/nr-matrix-test \ libnr/nr-point-fns-test \ @@ -218,9 +248,9 @@ 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 \ + util/test-util \ xml/test-xml \ xml/quote-test \ xml/repr-action-test @@ -228,25 +258,18 @@ check_PROGRAMS = \ # io/streamtest -test-all.cpp: \ - $(libnr_test_nr_a_SOURCES) \ - $(svg_test_svg_a_SOURCES) \ - $(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 \ - $(libnr_test_nr_includes) \ - $(svg_test_svg_includes) \ - $(xml_test_xml_includes) +test-src.cpp: \ + $(test_src_includes) + $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh --template=$(srcdir)/selfname.tpl -root -o test-src.cpp \ + $(test_src_includes) + +test_src_SOURCES = \ + test-src.cpp $(test_src_includes) -test_all_SOURCES = \ - test-all.cpp -test_all_LDADD = \ - $(libnr_test_nr_LDADD) \ - $(svg_test_svg_LDADD) \ - $(xml_test_xml_LDADD) +test_src_LDADD = \ + $(all_libs) \ + io/libio.a # ################################################ @@ -259,3 +282,5 @@ dist-hook: mkdir $(distdir)/pixmaps cp $(srcdir)/pixmaps/*xpm $(distdir)/pixmaps +distclean-local: + rm -f display/test-display.xml display/test-display.log helper/test-helper.xml helper/test-helper.log libnr/test-nr.xml libnr/test-nr.log svg/test-svg.xml svg/test-svg.log util/test-util.xml util/test-util.log xml/test-xml.xml xml/test-xml.log test-src.xml test-src.log