jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

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

Browse source 
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++
This commit is contained in:
Andreas Volz 2011-11-28 22:55:07 +01:00
parent 1c8e43e6d6
commit 04379cfb7d
16 changed files with 213 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -1,11 +1,19 @@
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 \

11
configure.ac
View file

@ -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
)

4
dbus-c++-1.pc.in
View file

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

13
dbus-c++-ecore-1-uninstalled.pc.in Normal file
View file

@ -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}

11
dbus-c++-ecore-1.pc.in Normal file
View file

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

13
dbus-c++-glib-1-uninstalled.pc.in Normal file
View file

@ -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}

11
dbus-c++-glib-1.pc.in Normal file
View file

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

8
examples/echo_ecore/Makefile.am
View file

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

3
examples/ecore/Makefile.am
View file

@ -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=$@

3
examples/glib/Makefile.am
View file

@ -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=$@

106
src/Makefile.am
View file

@ -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
$(ecore_CFLAGS)
if ENABLE_GLIB
GLIB_H = $(HEADER_DIR)/glib-integration.h
GLIB_CPP = glib-integration.cpp
endif
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)
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
lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
lib_include_HEADERS = $(HEADER_FILES)
libdbus_c___1dir=$(includedir)/dbus-c++-1/dbus-c++/
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)
EXTRA_DIST = \
$(libdbus_c___1_HEADERS)
libdbus_c___1_la_CXXFLAGS = \
-Wno-unused-parameter
## File created by the gnome-build tools
libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS) $(ecore_LIBS)
libdbus_c___1_la_LDFLAGS = -no-undefined
MAINTAINERCLEANFILES = \
Makefile.in

7
src/integration/Makefile.am Normal file
View file

@ -0,0 +1,7 @@
SUBDIRS = \
ecore\
glib
## File created by the gnome-build tools

34
src/integration/ecore/Makefile.am Normal file
View file

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

0
src/ecore-integration.cpp → src/integration/ecore/ecore-integration.cpp
View file

34
src/integration/glib/Makefile.am Normal file
View file

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

0
src/glib-integration.cpp → src/integration/glib/glib-integration.cpp
View file