diff options
| author | daleharvey <daleharvey@users.sourceforge.net> | 2006-06-23 13:15:16 +0000 |
|---|---|---|
| committer | daleharvey <daleharvey@users.sourceforge.net> | 2006-06-23 13:15:16 +0000 |
| commit | fcadbfb31e9e8bd463a16369e3de2ec96a413a6a (patch) | |
| tree | 41c3f39b304687f41ec169c8aa95a5984aa5910f /src/Makefile.am | |
| parent | quick g_message UndoStackObserver for tracing calls to the undo system (diff) | |
| download | inkscape-fcadbfb31e9e8bd463a16369e3de2ec96a413a6a.tar.gz inkscape-fcadbfb31e9e8bd463a16369e3de2ec96a413a6a.zip | |
manually merging the INKBOARD_PEDRO branch into trunk
(bzr r1268)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9b284e27d..090b4c683 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = \ $(FREETYPE_CFLAGS) \ $(GNOME_PRINT_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ - $(LIBLOUDMOUTH_CFLAGS) \ + $(INKBOARD_CFLAGS) \ $(XFT_CFLAGS) \ -DPOTRACE=\"potrace\" \ $(INKSCAPE_CFLAGS) \ @@ -36,6 +36,7 @@ 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 @@ -64,6 +65,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 \ @@ -126,6 +128,7 @@ EXTRA_DIST = \ io/makefile.in \ io/crystalegg.xml \ io/doc2html.xsl \ + pedro/makefile.in \ jabber_whiteboard/makefile.in \ libcroco/makefile.in \ libnr/makefile.in \ |