summaryrefslogtreecommitdiffstats
path: root/src/Makefile_insert
diff options
context:
space:
mode:
authordaleharvey <daleharvey@users.sourceforge.net>2006-06-23 13:15:16 +0000
committerdaleharvey <daleharvey@users.sourceforge.net>2006-06-23 13:15:16 +0000
commitfcadbfb31e9e8bd463a16369e3de2ec96a413a6a (patch)
tree41c3f39b304687f41ec169c8aa95a5984aa5910f /src/Makefile_insert
parentquick g_message UndoStackObserver for tracing calls to the undo system (diff)
downloadinkscape-fcadbfb31e9e8bd463a16369e3de2ec96a413a6a.tar.gz
inkscape-fcadbfb31e9e8bd463a16369e3de2ec96a413a6a.zip
manually merging the INKBOARD_PEDRO branch into trunk
(bzr r1268)
Diffstat (limited to 'src/Makefile_insert')
-rw-r--r--src/Makefile_insert4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile_insert b/src/Makefile_insert
index f6c591d83..c3182f3cc 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -262,6 +262,7 @@ inkscape_private_libs = \
ui/dialog/libuidialog.a \
dialogs/libspdialogs.a \
jabber_whiteboard/libjabber_whiteboard.a \
+ pedro/libpedro.a \
trace/libtrace.a \
svg/libspsvg.a \
widgets/libspwidgets.a \
@@ -300,7 +301,8 @@ all_libs = \
$(win32ldflags) \
$(PERL_LIBS) \
$(PYTHON_LIBS) \
- $(LIBLOUDMOUTH_LIBS)
+ $(LIBLOUDMOUTH_LIBS) \
+ $(INKBOARD_LIBS)
desktop.$(OBJEXT): helper/sp-marshal.h
document.$(OBJEXT): helper/sp-marshal.h inkscape_version.h