diff --git a/src/Makefile.am b/src/Makefile.am
index 569ef532cdb86463f06c338288a3eb1f04ebc0e8..7c8115701396dd03d0a5edf08499d936f732a9ee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
$(FREETYPE_CFLAGS) \
$(GNOME_PRINT_CFLAGS) \
$(GNOME_VFS_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(GNOME_PRINT_CFLAGS) \
$(GNOME_VFS_CFLAGS) \
- $(LIBLOUDMOUTH_CFLAGS) \
+ $(INKBOARD_CFLAGS) \
$(XFT_CFLAGS) \
-DPOTRACE=\"potrace\" \
$(INKSCAPE_CFLAGS) \
$(XFT_CFLAGS) \
-DPOTRACE=\"potrace\" \
$(INKSCAPE_CFLAGS) \
include extension/Makefile_insert
include extension/implementation/Makefile_insert
include extension/internal/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 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 libnr/Makefile_insert
include libnrtype/Makefile_insert
include libavoid/Makefile_insert
include livarot/Makefile_insert
include jabber_whiteboard/Makefile_insert
include libcroco/Makefile_insert
include libnr/Makefile_insert
include libnrtype/Makefile_insert
include libavoid/Makefile_insert
include livarot/Makefile_insert
+include libvpsc/Makefile_insert
+include libcola/Makefile_insert
include removeoverlap/Makefile_insert
include graphlayout/Makefile_insert
include svg/Makefile_insert
include removeoverlap/Makefile_insert
include graphlayout/Makefile_insert
include svg/Makefile_insert
libinkpre.a \
application/libinkapp.a \
dialogs/libspdialogs.a \
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 \
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 \
extension/libextension.a \
extension/script/libscript.a \
helper/libspchelp.a \
libnr/libnr.a \
libnrtype/libnrtype.a \
libavoid/libavoid.a \
libnr/libnr.a \
libnrtype/libnrtype.a \
libavoid/libavoid.a \
+ libvpsc/libvpsc.a \
+ libcola/libcola.a \
livarot/libvarot.a \
removeoverlap/libremoveoverlap.a \
graphlayout/libgraphlayout.a \
livarot/libvarot.a \
removeoverlap/libremoveoverlap.a \
graphlayout/libgraphlayout.a \
extension/implementation/makefile.in \
extension/internal/makefile.in \
extension/makefile.in \
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 \
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 \
libcroco/makefile.in \
libnr/makefile.in \
jabber_whiteboard/makefile.in \
libcroco/makefile.in \
libnr/makefile.in \
libnr/nr-translate-test$(EXEEXT) \
libnr/nr-types-test$(EXEEXT) \
libnr/test-nr$(EXEEXT) \
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) \
svg/test-svg$(EXEEXT) \
util/list-container-test$(EXEEXT) \
xml/test-xml$(EXEEXT) \
libnr/nr-translate-test \
libnr/nr-types-test \
libnr/test-nr \
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 \
svg/test-svg \
util/list-container-test \
xml/test-xml \
$(svg_test_svg_includes) \
$(xml_test_xml_includes) \
$(test_all_includes)
$(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) \
$(libnr_test_nr_includes) \
$(svg_test_svg_includes) \
$(xml_test_xml_includes) \
test_all_LDADD = \
$(all_libs) \
test_all_LDADD = \
$(all_libs) \
- io/libio.a \
- $(libnr_test_nr_LDADD) \
$(svg_test_svg_LDADD) \
$(svg_test_svg_LDADD) \
- $(xml_test_xml_LDADD)
+ $(libnr_test_nr_LDADD) \
+ $(xml_test_xml_LDADD) \
+ io/libio.a
# ################################################
# ################################################
mkdir $(distdir)/pixmaps
cp $(srcdir)/pixmaps/*xpm $(distdir)/pixmaps
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