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++

6 files changed, 135 insertions, 46 deletions

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