changed build architecture to build seperate libs for main/ecore/glib integration

dbus C has the same feature
this enables distribution package  creators easier to provide all mainloop integrations without getting to much deps for dbus-c++

16 files changed, 213 insertions, 57 deletions

diff --git a/Makefile.am b/Makefile.am
index 6bfa677..9ae7c15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,19 @@
-SUBDIRS = src tools data doc examples  test
+SUBDIRS = src tools data doc examples  test 
+
+if ENABLE_GLIB
+PKG_CONFIG_GLIB = dbus-c++-glib-1.pc
+endif
+
+if ENABLE_ECORE
+PKG_CONFIG_ECORE = dbus-c++-ecore-1.pc
+endif
 
 EXTRA_DIST = autogen.sh bootstrap libdbus-c++.spec libdbus-c++.spec.in
 
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dbus-c++-1.pc
+pkgconfig_DATA = dbus-c++-1.pc $(PKG_CONFIG_GLIB) $(PKG_CONFIG_ECORE)
 
 MAINTAINERCLEANFILES = \
 	configure \
diff --git a/configure.ac b/configure.ac
index f66e94f..3318b57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,8 +181,11 @@ AC_SUBST(BUILD_LIBDBUS_CXX_DIR)
 PKG_CHECK_MODULES(CPPUNIT, cppunit)
 AC_OUTPUT(
 	Makefile
-	src/Makefile
-	tools/Makefile
+        src/Makefile
+        src/integration/Makefile
+        src/integration/ecore/Makefile
+        src/integration/glib/Makefile
+        tools/Makefile
 	test/Makefile
 	test/generator/Makefile
 	test/functional/Makefile
@@ -199,5 +202,9 @@ AC_OUTPUT(
 	examples/echo_ecore/Makefile
 	dbus-c++-1.pc
 	dbus-c++-1-uninstalled.pc
+	dbus-c++-ecore-1.pc
+	dbus-c++-ecore-1-uninstalled.pc
+	dbus-c++-glib-1.pc
+	dbus-c++-glib-1-uninstalled.pc
 	libdbus-c++.spec
 )
diff --git a/dbus-c++-1.pc.in b/dbus-c++-1.pc.in
index bc5860a..661aee7 100644
--- a/dbus-c++-1.pc.in
+++ b/dbus-c++-1.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: dbus-c++
-Description: Native C++ bindings for D-Bus.
+Name: @PACKAGE@
+Description: Native C++ bindings for D-Bus
 Requires: dbus-1
 Version: @VERSION@
 Libs: -L${libdir} -ldbus-c++-1
diff --git a/dbus-c++-ecore-1-uninstalled.pc.in b/dbus-c++-ecore-1-uninstalled.pc.in
new file mode 100644
index 0000000..6c0ab5f
--- /dev/null
+++ b/dbus-c++-ecore-1-uninstalled.pc.in
@@ -0,0 +1,13 @@
+prefix=
+exec_prefix=
+libdir=src
+includedir=include
+
+Name: @PACKAGE@-ecore
+Description: Native C++ bindings for D-Bus (Ecore Mainloop), Not Installed
+Version: @VERSION@
+Requires: 
+Conflicts: 
+Libs: ${pcfiledir}/${libdir}/integration/ecore/libdbus-c++-ecore-1.la
+Cflags: -I${pcfiledir}/${includedir}
+
diff --git a/dbus-c++-ecore-1.pc.in b/dbus-c++-ecore-1.pc.in
new file mode 100644
index 0000000..4736274
--- /dev/null
+++ b/dbus-c++-ecore-1.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE@-ecore
+Description: Native C++ bindings for D-Bus (Ecore Mainloop)
+Requires: dbus-c++-1
+Version: @VERSION@
+Libs: -L${libdir} -ldbus-c++-ecore-1
+Cflags: -I${includedir}/dbus-c++-1 -DDBUS_API_SUBJECT_TO_CHANGE
diff --git a/dbus-c++-glib-1-uninstalled.pc.in b/dbus-c++-glib-1-uninstalled.pc.in
new file mode 100644
index 0000000..5405f00
--- /dev/null
+++ b/dbus-c++-glib-1-uninstalled.pc.in
@@ -0,0 +1,13 @@
+prefix=
+exec_prefix=
+libdir=src
+includedir=include
+
+Name: @PACKAGE@-glib
+Description: Native C++ bindings for D-Bus (Glib Mainloop), Not Installed
+Version: @VERSION@
+Requires: 
+Conflicts: 
+Libs: ${pcfiledir}/${libdir}/integration/glib/libdbus-c++-glib-1.la
+Cflags: -I${pcfiledir}/${includedir}
+
diff --git a/dbus-c++-glib-1.pc.in b/dbus-c++-glib-1.pc.in
new file mode 100644
index 0000000..e0a8bf7
--- /dev/null
+++ b/dbus-c++-glib-1.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE@-glib
+Description: Native C++ bindings for D-Bus (Glib Mainloop)
+Requires: dbus-c++-1
+Version: @VERSION@
+Libs: -L${libdir} -ldbus-c++-glib-1
+Cflags: -I${includedir}/dbus-c++-1 -DDBUS_API_SUBJECT_TO_CHANGE
diff --git a/examples/echo_ecore/Makefile.am b/examples/echo_ecore/Makefile.am
index 26c941e..4987e39 100644
--- a/examples/echo_ecore/Makefile.am
+++ b/examples/echo_ecore/Makefile.am
@@ -8,7 +8,8 @@ noinst_PROGRAMS = echo-server
 endif
 
 echo_server_SOURCES = echo-server-glue.h echo-server.h echo-server.cpp
-echo_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la \
+echo_server_LDADD = $(top_builddir)/src/libdbus-c++-ecore-1.la \
+	$(top_builddir)/src/libdbus-c++-1.la \
 	$(ecore_LIBS)
 
 echo-server-glue.h: echo-introspect.xml
@@ -19,8 +20,9 @@ noinst_PROGRAMS += echo-client-mt
 endif
 
 echo_client_mt_SOURCES = echo-client-glue.h echo-client.h echo-client.cpp
-echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-1.la \
-	@PTHREAD_LIBS@ $(ecore_LIBS)
+echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-ecore-1.la \
+	$(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@ \
+	$(ecore_LIBS)
 echo_client_mt_CXXFLAGS = @PTHREAD_CFLAGS@
 
 echo-client-glue.h: echo-introspect.xml
diff --git a/examples/ecore/Makefile.am b/examples/ecore/Makefile.am
index 93ab959..7a44868 100644
--- a/examples/ecore/Makefile.am
+++ b/examples/ecore/Makefile.am
@@ -7,7 +7,8 @@ noinst_PROGRAMS = dbus_ecore
 endif
 
 dbus_ecore_SOURCES = dbus_ecore-glue.h dbus_ecore.h dbus_ecore.cpp $(top_srcdir)/tools/xml.cpp
-dbus_ecore_LDADD = $(top_builddir)/src/libdbus-c++-1.la $(ecore_LIBS) $(xml_LIBS)
+dbus_ecore_LDADD = $(top_builddir)/src/libdbus-c++-ecore-1.la \
+	$(top_builddir)/src/libdbus-c++-1.la $(ecore_LIBS) $(xml_LIBS)
 
 dbus_ecore-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml
 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@
diff --git a/examples/glib/Makefile.am b/examples/glib/Makefile.am
index 42a33d8..cb7ef3c 100644
--- a/examples/glib/Makefile.am
+++ b/examples/glib/Makefile.am
@@ -7,7 +7,8 @@ noinst_PROGRAMS = dbus-browser
 endif
 
 dbus_browser_SOURCES = dbus-glue.h dbus-browser.h dbus-browser.cpp $(top_srcdir)/tools/xml.cpp
-dbus_browser_LDADD = $(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS)
+dbus_browser_LDADD = $(top_builddir)/src/libdbus-c++-glib-1.la \
+	$(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS)
 
 dbus-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml
 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@
diff --git a/src/Makefile.am b/src/Makefile.am
index e20f211..802fcfc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,56 +1,70 @@
+lib_LTLIBRARIES = \
+	libdbus-c++-1.la
+
+libdbus_c___1_la_SOURCES = \
+	connection.cpp    \
+	connection_p.h    \
+	debug.cpp    \
+	dispatcher.cpp    \
+	dispatcher_p.h    \
+	error.cpp    \
+	eventloop.cpp    \
+	eventloop-integration.cpp    \
+	interface.cpp    \
+	internalerror.h    \
+	introspection.cpp    \
+	message.cpp    \
+	message_p.h    \
+	object.cpp    \
+	pendingcall.cpp    \
+	pendingcall_p.h    \
+	pipe.cpp    \
+	property.cpp    \
+	server.cpp    \
+	server_p.h    \
+	types.cpp    
+
+libdbus_c___1_la_CXXFLAGS = \
+	-I$(top_srcdir)/include \
+	-Wno-unused-parameter
+
+libdbus_c___1_la_LIBADD = \
+	$(dbus_LIBS)
+
 AM_CPPFLAGS = \
 	$(dbus_CFLAGS) \
 	$(glib_CFLAGS) \
-	$(ecore_CFLAGS) \
-	$(PRIVATE_CFLAGS) \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include
-
-if ENABLE_GLIB
-GLIB_H = $(HEADER_DIR)/glib-integration.h
-GLIB_CPP = glib-integration.cpp
-endif
+	$(ecore_CFLAGS)
 
-if ENABLE_ECORE
-ECORE_H = $(HEADER_DIR)/ecore-integration.h
-ECORE_CPP = ecore-integration.cpp
-endif
+SUBDIRS = \
+	integration
 
 HEADER_DIR  = $(top_srcdir)/include/dbus-c++
-HEADER_FILES = \
-	$(HEADER_DIR)/dbus.h \
-	$(HEADER_DIR)/types.h \
-	$(HEADER_DIR)/connection.h \
-	$(HEADER_DIR)/property.h \
-	$(HEADER_DIR)/debug.h \
-	$(HEADER_DIR)/error.h \
-	$(HEADER_DIR)/interface.h \
-	$(HEADER_DIR)/message.h \
-	$(HEADER_DIR)/dispatcher.h \
-	$(HEADER_DIR)/object.h \
-	$(HEADER_DIR)/pendingcall.h \
-	$(HEADER_DIR)/server.h \
-	$(HEADER_DIR)/util.h \
-	$(HEADER_DIR)/refptr_impl.h \
-	$(HEADER_DIR)/introspection.h \
-	$(HEADER_DIR)/api.h \
-	$(HEADER_DIR)/eventloop.h \
-	$(HEADER_DIR)/eventloop-integration.h \
-	$(HEADER_DIR)/pipe.h \
-	$(GLIB_H) $(ECORE_H)
-
-lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
-lib_include_HEADERS = $(HEADER_FILES)
-
-lib_LTLIBRARIES = libdbus-c++-1.la
-libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h eventloop.cpp eventloop-integration.cpp pipe.cpp $(GLIB_CPP) $(ECORE_CPP) 
+libdbus_c___1_HEADERS = \
+	$(HEADER_DIR)/api.h          \
+	$(HEADER_DIR)/connection.h          \
+	$(HEADER_DIR)/dbus.h          \
+	$(HEADER_DIR)/debug.h          \
+	$(HEADER_DIR)/dispatcher.h          \
+	$(HEADER_DIR)/error.h          \
+	$(HEADER_DIR)/eventloop.h          \
+	$(HEADER_DIR)/eventloop-integration.h          \
+	$(HEADER_DIR)/interface.h          \
+	$(HEADER_DIR)/introspection.h          \
+	$(HEADER_DIR)/message.h          \
+	$(HEADER_DIR)/object.h          \
+	$(HEADER_DIR)/pendingcall.h          \
+	$(HEADER_DIR)/pipe.h          \
+	$(HEADER_DIR)/property.h          \
+	$(HEADER_DIR)/refptr_impl.h          \
+	$(HEADER_DIR)/server.h          \
+	$(HEADER_DIR)/types.h          \
+	$(HEADER_DIR)/util.h
 
-libdbus_c___1_la_CXXFLAGS = \
-	-Wno-unused-parameter
+libdbus_c___1dir=$(includedir)/dbus-c++-1/dbus-c++/
 
-libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS) $(ecore_LIBS)
+EXTRA_DIST = \
+	$(libdbus_c___1_HEADERS)
 
-libdbus_c___1_la_LDFLAGS = -no-undefined
+## File created by the gnome-build tools
 
-MAINTAINERCLEANFILES = \
-	Makefile.in
diff --git a/src/integration/Makefile.am b/src/integration/Makefile.am
new file mode 100644
index 0000000..3553be4
--- /dev/null
+++ b/src/integration/Makefile.am
@@ -0,0 +1,7 @@
+
+SUBDIRS = \
+	ecore\
+	glib
+
+## File created by the gnome-build tools
+
diff --git a/src/integration/ecore/Makefile.am b/src/integration/ecore/Makefile.am
new file mode 100644
index 0000000..f40535b
--- /dev/null
+++ b/src/integration/ecore/Makefile.am
@@ -0,0 +1,34 @@
+if ENABLE_ECORE
+
+lib_LTLIBRARIES = \
+	libdbus-c++-ecore-1.la
+
+libdbus_c___ecore_1_la_SOURCES = \
+	ecore-integration.cpp
+
+libdbus_c___ecore_1_la_CXXFLAGS = \
+	-I$(top_srcdir)/include \
+	-Wno-unused-parameter
+
+libdbus_c___ecore_1_la_LIBADD = \
+	$(dbus_LIBS) \
+	$(ecore_LIBS)
+
+AM_CPPFLAGS = \
+	$(dbus_CFLAGS) \
+	$(ecore_CFLAGS)
+
+HEADER_DIR = $(top_srcdir)/include/dbus-c++
+libdbus_c___ecore_1_HEADERS = \
+	$(HEADER_DIR)/ecore-integration.h
+
+libdbus_c___ecore_1dir = \
+	$(includedir)/dbus-c++-1/dbus-c++/
+
+EXTRA_DIST = \
+	$(libdbus_c___ecore_1_HEADERS)
+
+endif
+
+## File created by the gnome-build tools
+
diff --git a/src/ecore-integration.cpp b/src/integration/ecore/ecore-integration.cpp
index c270163..c270163 100644
--- a/src/ecore-integration.cpp
+++ b/src/integration/ecore/ecore-integration.cpp
diff --git a/src/integration/glib/Makefile.am b/src/integration/glib/Makefile.am
new file mode 100644
index 0000000..83e8b01
--- /dev/null
+++ b/src/integration/glib/Makefile.am
@@ -0,0 +1,34 @@
+if ENABLE_GLIB
+
+lib_LTLIBRARIES = \
+	libdbus-c++-glib-1.la
+
+libdbus_c___glib_1_la_SOURCES = \
+	glib-integration.cpp
+
+libdbus_c___glib_1_la_CXXFLAGS = \
+	-I$(top_srcdir)/include \
+	-Wno-unused-parameter
+
+libdbus_c___glib_1_la_LIBADD = \
+	$(dbus_LIBS) \
+	$(glib_LIBS)
+
+AM_CPPFLAGS = \
+	$(dbus_CFLAGS) \
+	$(glib_CFLAGS)
+
+HEADER_DIR = $(top_srcdir)/include/dbus-c++
+libdbus_c___glib_1_HEADERS = \
+	$(HEADER_DIR)/glib-integration.h
+
+libdbus_c___glib_1dir = \
+	$(includedir)/dbus-c++-1/dbus-c++/
+
+EXTRA_DIST = \
+	$(libdbus_c___glib_1_HEADERS)
+
+endif
+
+## File created by the gnome-build tools
+
diff --git a/src/glib-integration.cpp b/src/integration/glib/glib-integration.cpp
index 043cd40..043cd40 100644
--- a/src/glib-integration.cpp
+++ b/src/integration/glib/glib-integration.cpp