Fixing includes

[inkscape.git] / src / extension / dbus / Makefile_insert

diff --git a/src/extension/dbus/Makefile_insert b/src/extension/dbus/Makefile_insert
index c8bee0ca6a28c08ca6dd000bfcb4eaebe165f4ff..35b7c6fff2e6b5d09dbc3ab6ca8d0232e4e3b154 100644 (file)
--- a/src/extension/dbus/Makefile_insert
+++ b/src/extension/dbus/Makefile_insert
@@ -1,5 +1,9 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
+#############################
+# Sources for DBus interface
+#############################
+
 ink_common_sources +=  \
        extension/dbus/dbus-init.cpp  \
        extension/dbus/dbus-init.h  \
@@ -8,11 +12,9 @@ ink_common_sources += \
        extension/dbus/document-interface.cpp  \
        extension/dbus/document-interface.h
 
-## Slightly concerned about this.
-## Would use += but it has to be set first.
-BUILT_SOURCES =   \
-       extension/dbus/application-server-glue.h   \
-       extension/dbus/document-server-glue.h
+###########################
+# Build DBus wrapper files
+###########################
 
 extension/dbus/application-server-glue.h: extension/dbus/application-interface.xml
        dbus-binding-tool --mode=glib-server --output=$@ --prefix=application_interface $^
@@ -20,12 +22,61 @@ extension/dbus/application-server-glue.h: extension/dbus/application-interface.x
 extension/dbus/document-server-glue.h: extension/dbus/document-interface.xml
        dbus-binding-tool --mode=glib-server --output=$@ --prefix=document_interface $^
 
+extension/dbus/document-client-glue.h: extension/dbus/document-interface.xml
+       dbus-binding-tool --mode=glib-client --output=$@ --prefix=document_interface $^
+
+BUILT_SOURCES += \
+       extension/dbus/application-server-glue.h   \
+       extension/dbus/document-server-glue.h   \
+       extension/dbus/document-client-glue.h
+
+###########################
+# Distribut DBus interface
+###########################
+
+EXTRA_DIST += \
+       extension/dbus/application-interface.xml \
+       extension/dbus/document-interface.xml
+
+###########################
+# DBus Activation Service
+###########################
+
 # Dbus service file
-servicedir = "/usr/share/dbus-1/services"
+servicedir = $(DBUSSERVICEDIR)
 service_in_files = extension/dbus/org.inkscape.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
 # Rule to make the service file with bindir expanded
 $(service_DATA): $(service_in_files) Makefile
-       @sed -e "s|@bindir@|$(bindir)|" $<> $@
+       @sed -e "s|bindir|$(prefix)|" $<> $@
+
+############################
+# DBus Interface Helper Lib
+############################
+
+lib_LTLIBRARIES = \
+       libinkdbus.la
+
+libinkdbusincludedir = $(includedir)/libinkdbus-0.48/libinkdbus
+libinkdbusinclude_HEADERS = \
+       extension/dbus/wrapper/inkscape-dbus-wrapper.h
+
+libinkdbus_la_SOURCES = \
+       extension/dbus/wrapper/inkscape-dbus-wrapper.h \
+       extension/dbus/wrapper/inkscape-dbus-wrapper.c
+
+libinkdbus_la_LDFLAGS = \
+       -version-info 0:0:0 \
+       -no-undefined \
+       -export-symbols-regex "^[^_d].*"
+
+libinkdbus_la_CFLAGS = \
+       $(DBUS_CFLAGS) \
+       $(INKSCAPE_CFLAGS) \
+       -I$(builddir)/extension/dbus \
+       -Wall -Werror
 
+libinkdbus_la_LIBADD = \
+       $(DBUS_LIBS) \
+       $(INKSCAPE_LIBS)