Merging in from trunk

[inkscape.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 63b27398afd27db6e97dd9ce2081d98ed472d941..8f9682832785c2143c8d615aabd24f97af159790 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,6 +45,7 @@ all_libs =                    \
        $(PYTHON_LIBS)          \
        $(INKBOARD_LIBS)        \
        $(LIBWPG_LIBS)          \
+       $(DBUS_LIBS)            \
        $(IMAGEMAGICK_LIBS)
 
 # Add sources common for Inkscape and Inkview to this variable.
@@ -62,6 +63,7 @@ INCLUDES =    \
        $(IMAGEMAGICK_CFLAGS) \
        $(INKBOARD_CFLAGS) \
        $(LIBWPG_CFLAGS) \
+       $(DBUS_CFLAGS) \
        $(XFT_CFLAGS)   \
        $(LCMS_CFLAGS)  \
        $(POPPLER_CFLAGS)       \
@@ -72,6 +74,7 @@ INCLUDES =    \
        $(WIN32_CFLAGS) \
        -I$(srcdir)/bind/javainc \
        -I$(srcdir)/bind/javainc/linux \
+       -I$(builddir)/extension/dbus \
        $(AM_CPPFLAGS)
 
 CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl
@@ -104,6 +107,7 @@ include dialogs/Makefile_insert
 include display/Makefile_insert
 include dom/Makefile_insert
 include extension/Makefile_insert
+include extension/dbus/Makefile_insert
 include extension/implementation/Makefile_insert
 include extension/internal/Makefile_insert
 include extension/script/Makefile_insert