X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=0c585d6a9de38a2f9d5815be5755a2cec4319eb4;hb=6c572dd450c636a069b4d513f1b85742c1afb9fd;hp=03b58c6108050c96a3f98be372726e4397efe232;hpb=2cbc3f167bb47f2580274c8d1456a1e2de38b232;p=inkscape.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 03b58c610..0c585d6a9 100644
--- 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.
@@ -53,6 +54,10 @@ ink_common_sources =
 inkscape_SOURCES =
 # Add Inkview-only sources here.
 inkview_SOURCES =
+# Add sources that are built from meta files
+BUILT_SOURCES =
+# Extra files to distribute
+EXTRA_DIST =
 
 INCLUDES =	\
 	$(PERL_CFLAGS) $(PYTHON_CFLAGS)	\
@@ -62,6 +67,7 @@ INCLUDES =	\
 	$(IMAGEMAGICK_CFLAGS) \
 	$(INKBOARD_CFLAGS) \
 	$(LIBWPG_CFLAGS) \
+	$(DBUS_CFLAGS) \
 	$(XFT_CFLAGS)	\
 	$(LCMS_CFLAGS)	\
 	$(POPPLER_CFLAGS)	\
@@ -72,6 +78,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
@@ -99,12 +106,12 @@ endif
 
 # Include all partial makefiles from subdirectories
 include Makefile_insert
-include application/Makefile_insert
 include bind/Makefile_insert
 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
@@ -138,7 +145,7 @@ include trace/Makefile_insert
 include 2geom/Makefile_insert
 
 # Extra files not mentioned as sources to include in the source tarball
-EXTRA_DIST =	\
+EXTRA_DIST +=	\
 	$(top_srcdir)/Doxyfile	\
 	sp-skeleton.cpp sp-skeleton.h	\
 	util/makefile.in	\