r16913@shi: ted | 2007-10-30 21:32:09 -0700

 Adding in libwpg

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e6cd1f263ded0a0f3dabdf03cc23cc46b8bb987..95ab6ce56e600e250836280a6938b94544430dd0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,7 @@ INCLUDES =    \
        $(GNOME_PRINT_CFLAGS)   \
        $(GNOME_VFS_CFLAGS)     \
        $(INKBOARD_CFLAGS) \
+       $(LIBWPG_CFLAGS) \
        $(XFT_CFLAGS)   \
        $(GTK_UNIX_PRINT_CFLAGS)        \
        $(POPPLER_CFLAGS)       \
@@ -252,7 +253,7 @@ test-all.cpp: \
                $(svg_test_svg_includes)        \
                $(xml_test_xml_includes)        \
                $(test_all_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/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)        \

diff --git a/src/Makefile_insert b/src/Makefile_insert
index 2efbd806efcef0462a6db1b6cbe22036f5867e25..886ad6dc9262cae52e960a33d4ebc5f0b321c3ba 100644 (file)
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -371,6 +371,7 @@ all_libs =                  \
        $(PERL_LIBS)            \
        $(PYTHON_LIBS)  \
        $(INKBOARD_LIBS) \
+       $(LIBWPG_LIBS) \
        $(IMAGEMAGICK_LIBS)
 
 desktop.$(OBJEXT): helper/sp-marshal.h