From 7841877d647509a1d338b98e409a635cedff1342 Mon Sep 17 00:00:00 2001 From: Andreas Volz Date: Tue, 22 Jul 2008 22:34:47 +0200 Subject: [PATCH] many changes --- README | 4 ++ autogen.sh | 19 +----- config/ax_config_header.m4~ | 63 -------------------- configure.ac | 40 +++++++++---- examples/echo/Makefile.am | 3 +- examples/echo/echo-client.cpp | 8 +-- examples/echo/echo-server.cpp | 4 ++ include/dbus-c++/api.h | 4 -- include/dbus-c++/config.h.in | 73 ------------------------ include/dbus-c++/connection.h | 4 +- include/dbus-c++/dbus.h | 4 -- include/dbus-c++/debug.h | 4 +- include/dbus-c++/dispatcher.h | 7 ++- include/dbus-c++/error.h | 4 +- include/dbus-c++/eventloop-integration.h | 4 +- include/dbus-c++/eventloop.h | 4 +- include/dbus-c++/glib-integration.h | 4 +- include/dbus-c++/interface.h | 4 +- include/dbus-c++/introspection.h | 4 +- include/dbus-c++/message.h | 4 +- include/dbus-c++/object.h | 4 +- include/dbus-c++/pendingcall.h | 4 +- include/dbus-c++/property.h | 4 +- include/dbus-c++/refptr_impl.h | 4 +- include/dbus-c++/server.h | 4 +- include/dbus-c++/types.h | 4 +- include/dbus-c++/util.h | 4 +- src/Makefile.am | 15 +++-- src/connection.cpp | 6 ++ src/connection_p.h | 5 +- src/debug.cpp | 6 ++ src/dispatcher.cpp | 6 ++ src/dispatcher_p.h | 5 +- src/error.cpp | 6 ++ src/eventloop-integration.cpp | 6 ++ src/eventloop.cpp | 6 ++ src/glib-integration.cpp | 6 ++ src/interface.cpp | 6 ++ src/internalerror.h | 5 +- src/introspection.cpp | 6 ++ src/message.cpp | 6 ++ src/message_p.h | 5 +- src/object.cpp | 6 ++ src/pendingcall.cpp | 6 ++ src/pendingcall_p.h | 5 +- src/property.cpp | 7 +++ src/server.cpp | 6 ++ src/server_p.h | 5 +- src/types.cpp | 6 ++ 49 files changed, 208 insertions(+), 221 deletions(-) delete mode 100644 config/ax_config_header.m4~ delete mode 100644 include/dbus-c++/config.h.in diff --git a/README b/README index e69de29..9782e0a 100644 --- a/README +++ b/README @@ -0,0 +1,4 @@ +Debugging +--------- +To compile debugging code configure the project with the --enable-debug option. Then at runtime you may set the environment variable DBUSXX_VERBOSE to '1' to activate debugging and to '0' to deactivate debugging. + diff --git a/autogen.sh b/autogen.sh index 4af86e2..677a76a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,18 +1,3 @@ -#!/bin/bash +#!/bin/sh -function autocmd() -{ - echo "Running ${1}..." - $* || { - echo "Error running ${1}" - exit 1 - } -} - -autocmd libtoolize --force --copy -autocmd aclocal -autocmd autoheader -autocmd automake --add-missing --force-missing --copy -Wall -autocmd autoconf - -echo "Autogen done, now you can ./configure" +./bootstrap && ./configure $@ diff --git a/config/ax_config_header.m4~ b/config/ax_config_header.m4~ deleted file mode 100644 index ab7d050..0000000 --- a/config/ax_config_header.m4~ +++ /dev/null @@ -1,63 +0,0 @@ -dnl AX_CONFIG_PRIVATE_HEADER -dnl -dnl Parameter 1: Output file for private config header (Default: config-private.h) -dnl Parameter 2: Library name -dnl Parameter 3: define for header include (Default: HAVE_capitalize(Library name)_CONFIG_H -dnl needs to be redefined if library name containes a char that isn't allowed in #define -dnl -AC_DEFUN([AX_CONFIG_PRIVATE_HEADER], -[ - -if test x$# = x0; then - dnl define a fallback output if nothing given - CONFIG_HEADER="config-private.h" -else - CONFIG_HEADER=$1 -fi - -CF_NAME=`basename $1` -DATE=`date` - -dnl Create new file or empty it -echo "/* File: $CF_NAME generated on $DATE */" > $CONFIG_HEADER - -if test x$# = x2; then - echo "" >> $CONFIG_HEADER - echo "/* Build configuration for $2 */" >> $CONFIG_HEADER -fi - -echo "" >> $CONFIG_HEADER - -if test x$# = x3; then - PRIVATE_CFLAGS="-D$3" -else - PRIVATE_CFLAGS="-DHAVE_$2_CONFIG_H" -fi - -AC_SUBST(PRIVATE_CFLAGS) - -])dnl - -dnl AX_DEFINE_PRIVATE -dnl -dnl -dnl -dnl -dnl -AC_DEFUN([AX_DEFINE_PRIVATE], -[ - -if test x$# = x1; then - echo "#define $1" >> $CONFIG_HEADER - echo "" >> $CONFIG_HEADER -elif test x$# = x2; then - echo "#define $1 $2" >> $CONFIG_HEADER - echo "" >> $CONFIG_HEADER -elif test x$# = x3; then - echo "/* $3 */" >> $CONFIG_HEADER - echo "#define $1 $2" >> $CONFIG_HEADER - echo "" >> $CONFIG_HEADER -fi - -])dnl - diff --git a/configure.ac b/configure.ac index 230564b..77759e1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,8 @@ AC_PREREQ(2.59) AC_INIT([libdbus-c++], 0.5.0, [shackan@gmail.com]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -AM_CONFIG_HEADER([include/dbus-c++/config.h]) +AM_CONFIG_HEADER([config.h]) +AX_CONFIG_PRIVATE_HEADER(include/dbus-c++/dbus-c++-config.h, dbus-c++,HAVE_DBUSPP_CONFIG_H) AC_CANONICAL_HOST @@ -20,6 +21,13 @@ AC_ARG_ENABLE(debug, [enable_debug=no] ) +AC_ARG_ENABLE(ecore, + AS_HELP_STRING([--enable-ecore], + [enable ecore integration]), + [enable_ecore=$enableval], + [enable_ecore=no] +) + AC_ARG_ENABLE(glib, AS_HELP_STRING([--enable-glib], [enable glib integration]), @@ -75,17 +83,17 @@ AC_SUBST(dbus_LIBS) DBUS_API_STABLE_VERSION=1.0.0 PKG_CHECK_EXISTS([dbus-1 < $DBUS_API_STABLE_VERSION], - [AC_DEFINE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])] + [AX_DEFINE_PRIVATE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])] ) DBUS_THREADS_INIT_DEFAULT_VERSION=0.93 PKG_CHECK_EXISTS([dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION], - [AC_DEFINE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])] + [AX_DEFINE_PRIVATE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])] ) DBUS_RECURSIVE_MUTEX_VERSION=0.95 PKG_CHECK_EXISTS([dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION], - [AC_DEFINE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])] + [AX_DEFINE_PRIVATE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])] ) @@ -105,6 +113,15 @@ AM_CONDITIONAL(ENABLE_GLIB, test 0 = 1) AM_CONDITIONAL(HAVE_GTKMM, test 0 = 1) fi +if test "$enable_ecore" = "yes" ; then +PKG_CHECK_MODULES([ecore], ecore) +AC_SUBST(ecore_CFLAGS) +AC_SUBST(ecore_LIBS) +AM_CONDITIONAL(ENABLE_ECORE, test 1 = 1) +else +AM_CONDITIONAL(ENABLE_ECORE, test 0 = 1) +fi + AC_CHECK_LIB([expat], XML_ParserCreate_MM, [AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false)], have_expat=false) @@ -120,14 +137,15 @@ xml_LIBS=-lexpat AC_SUBST(xml_CFLAGS) AC_SUBST(xml_LIBS) -AC_CHECK_LIB([pthread], pthread_create, - [AC_CHECK_HEADERS(pthread.h, have_pthread=true, have_pthread=false)], - have_pthread=false) - -AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "true") +ACX_PTHREAD +if test x"$acx_pthread_ok" = xyes; then + AC_DEFINE(HAVE_PTHREAD_H, 1, [Define to enable pthread support]) + AM_CONDITIONAL(HAVE_PTHREAD, test x"$acx_pthread_ok" = xyes) +fi if test "$enable_debug" = "yes" ; then - CXXFLAGS="$CXXFLAGS -Wall -ggdb -O0 -DDEBUG" + CXXFLAGS="$CXXFLAGS -Wall -ggdb -O0" + AC_DEFINE(DEBUG, 1, [Define to enable debug build]) else CXXFLAGS="$CXXFLAGS -Wall -O3" fi @@ -173,7 +191,6 @@ AC_ARG_WITH(build-libdbus-cxx, ) AC_SUBST(BUILD_LIBDBUS_CXX_DIR) - # Save processed files AC_OUTPUT( @@ -189,5 +206,6 @@ AC_OUTPUT( examples/hal/Makefile examples/glib/Makefile dbus-c++-1.pc + dbus-c++-1-uninstalled.pc libdbus-c++.spec ) diff --git a/examples/echo/Makefile.am b/examples/echo/Makefile.am index 1ba7065..713c749 100644 --- a/examples/echo/Makefile.am +++ b/examples/echo/Makefile.am @@ -15,7 +15,8 @@ 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 -lpthread +echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@ +echo_client_mt_CXXFLAGS = @PTHREAD_CFLAGS@ echo-client-glue.h: echo-introspect.xml $(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@ diff --git a/examples/echo/echo-client.cpp b/examples/echo/echo-client.cpp index 1155365..3e1f19e 100644 --- a/examples/echo/echo-client.cpp +++ b/examples/echo/echo-client.cpp @@ -1,12 +1,12 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "echo-client.h" #include #include #include -#ifdef HAVE_CONFIG_H -#include -#endif - using namespace std; static const char* ECHO_SERVER_NAME = "org.freedesktop.DBus.Examples.Echo"; diff --git a/examples/echo/echo-server.cpp b/examples/echo/echo-server.cpp index 0ec43df..deb1aa7 100644 --- a/examples/echo/echo-server.cpp +++ b/examples/echo/echo-server.cpp @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "echo-server.h" #include #include diff --git a/include/dbus-c++/api.h b/include/dbus-c++/api.h index 9afe229..48904e8 100644 --- a/include/dbus-c++/api.h +++ b/include/dbus-c++/api.h @@ -25,10 +25,6 @@ #ifndef __DBUSXX_API_H #define __DBUSXX_API_H -#ifdef HAVE_CONFIG_H -#include -#endif - #ifdef GCC_HASCLASSVISIBILITY # define DXXAPILOCAL __attribute__ ((visibility("hidden"))) # define DXXAPIPUBLIC __attribute__ ((visibility("default"))) diff --git a/include/dbus-c++/config.h.in b/include/dbus-c++/config.h.in deleted file mode 100644 index f803e5d..0000000 --- a/include/dbus-c++/config.h.in +++ /dev/null @@ -1,73 +0,0 @@ -/* include/dbus-c++/config.h.in. Generated from configure.ac by autoheader. */ - -/* unstable DBus */ -#undef DBUS_API_SUBJECT_TO_CHANGE - -/* DBus supports recursive mutexes (needs DBus >= 0.95) */ -#undef DBUS_HAS_RECURSIVE_MUTEX - -/* dbus_threads_init_default (needs DBus >= 0.93) */ -#undef DBUS_HAS_THREADS_INIT_DEFAULT - -/* to enable hidden symbols */ -#undef GCC_HASCLASSVISIBILITY - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_EXPAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_PTHREAD_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION diff --git a/include/dbus-c++/connection.h b/include/dbus-c++/connection.h index 62d4941..d386ff9 100644 --- a/include/dbus-c++/connection.h +++ b/include/dbus-c++/connection.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_CONNECTION_H #define __DBUSXX_CONNECTION_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/include/dbus-c++/dbus.h b/include/dbus-c++/dbus.h index 0e05e6a..7dfc164 100644 --- a/include/dbus-c++/dbus.h +++ b/include/dbus-c++/dbus.h @@ -25,10 +25,6 @@ #ifndef __DBUSXX_DBUS_H #define __DBUSXX_DBUS_H -#ifdef HAVE_CONFIG_H -#include -#endif - #include "types.h" #include "interface.h" #include "object.h" diff --git a/include/dbus-c++/debug.h b/include/dbus-c++/debug.h index 0096987..8c17371 100644 --- a/include/dbus-c++/debug.h +++ b/include/dbus-c++/debug.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_DEBUG_H #define __DBUSXX_DEBUG_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include "api.h" diff --git a/include/dbus-c++/dispatcher.h b/include/dbus-c++/dispatcher.h index 1d331cf..67ad979 100644 --- a/include/dbus-c++/dispatcher.h +++ b/include/dbus-c++/dispatcher.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_DISPATCHER_H #define __DBUSXX_DISPATCHER_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include "api.h" @@ -45,6 +45,9 @@ public: virtual ~Timeout(){} + /*! + * return The dbus timeout interval in miliseconds. + */ int interval() const; bool enabled() const; diff --git a/include/dbus-c++/error.h b/include/dbus-c++/error.h index 21540cd..8a9563d 100644 --- a/include/dbus-c++/error.h +++ b/include/dbus-c++/error.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_ERROR_H #define __DBUSXX_ERROR_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include "api.h" diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h index 01895a8..b01bb01 100644 --- a/include/dbus-c++/eventloop-integration.h +++ b/include/dbus-c++/eventloop-integration.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_EVENTLOOP_INTEGRATION_H #define __DBUSXX_EVENTLOOP_INTEGRATION_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include "api.h" diff --git a/include/dbus-c++/eventloop.h b/include/dbus-c++/eventloop.h index 4ee9bc5..20e2cb8 100644 --- a/include/dbus-c++/eventloop.h +++ b/include/dbus-c++/eventloop.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_EVENTLOOP_H #define __DBUSXX_EVENTLOOP_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #ifdef HAVE_PTHREAD_H diff --git a/include/dbus-c++/glib-integration.h b/include/dbus-c++/glib-integration.h index a60e3f8..a4ab5f4 100644 --- a/include/dbus-c++/glib-integration.h +++ b/include/dbus-c++/glib-integration.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_GLIB_INTEGRATION_H #define __DBUSXX_GLIB_INTEGRATION_H -#ifdef HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/include/dbus-c++/interface.h b/include/dbus-c++/interface.h index ea10d57..5c0a902 100644 --- a/include/dbus-c++/interface.h +++ b/include/dbus-c++/interface.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_INTERFACE_H #define __DBUSXX_INTERFACE_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/include/dbus-c++/introspection.h b/include/dbus-c++/introspection.h index baae4a0..33da8e9 100644 --- a/include/dbus-c++/introspection.h +++ b/include/dbus-c++/introspection.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_INTROSPECTION_H #define __DBUSXX_INTROSPECTION_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include "api.h" diff --git a/include/dbus-c++/message.h b/include/dbus-c++/message.h index a10fbd0..6eaf700 100644 --- a/include/dbus-c++/message.h +++ b/include/dbus-c++/message.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_MESSAGE_H #define __DBUSXX_MESSAGE_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/include/dbus-c++/object.h b/include/dbus-c++/object.h index f597a42..7ebc45d 100644 --- a/include/dbus-c++/object.h +++ b/include/dbus-c++/object.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_OBJECT_H #define __DBUSXX_OBJECT_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/include/dbus-c++/pendingcall.h b/include/dbus-c++/pendingcall.h index f7d0da6..f342b8e 100644 --- a/include/dbus-c++/pendingcall.h +++ b/include/dbus-c++/pendingcall.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_PENDING_CALL_H #define __DBUSXX_PENDING_CALL_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include "api.h" diff --git a/include/dbus-c++/property.h b/include/dbus-c++/property.h index d074167..669c079 100644 --- a/include/dbus-c++/property.h +++ b/include/dbus-c++/property.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_PROPERTY_H #define __DBUSXX_PROPERTY_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include "api.h" diff --git a/include/dbus-c++/refptr_impl.h b/include/dbus-c++/refptr_impl.h index 363f065..ed98770 100644 --- a/include/dbus-c++/refptr_impl.h +++ b/include/dbus-c++/refptr_impl.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_REFPTR_IMPL_H #define __DBUSXX_REFPTR_IMPL_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include "api.h" diff --git a/include/dbus-c++/server.h b/include/dbus-c++/server.h index 4259e30..f60de6b 100644 --- a/include/dbus-c++/server.h +++ b/include/dbus-c++/server.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_SERVER_H #define __DBUSXX_SERVER_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/include/dbus-c++/types.h b/include/dbus-c++/types.h index aad9703..2051fc3 100644 --- a/include/dbus-c++/types.h +++ b/include/dbus-c++/types.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_TYPES_H #define __DBUSXX_TYPES_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/include/dbus-c++/util.h b/include/dbus-c++/util.h index 9f2807a..9d86ea8 100644 --- a/include/dbus-c++/util.h +++ b/include/dbus-c++/util.h @@ -25,8 +25,8 @@ #ifndef __DBUSXX_UTIL_H #define __DBUSXX_UTIL_H -#ifdef HAVE_CONFIG_H -#include +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include "api.h" diff --git a/src/Makefile.am b/src/Makefile.am index f449e9d..5b78d1f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ $(dbus_CFLAGS) \ $(glib_CFLAGS) \ + $(ecore_CFLAGS) \ + $(PRIVATE_CFLAGS) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include @@ -9,7 +11,12 @@ GLIB_H = $(HEADER_DIR)/glib-integration.h GLIB_CPP = glib-integration.cpp endif -CONFIG_H = $(top_builddir)/include/dbus-c++/config.h +if ENABLE_ECORE +ECORE_H = $(HEADER_DIR)/ecore-integration.h $(HEADER_DIR)/Ecore_Dispatcher.h +ECORE_CPP = ecore-integration.cpp Ecore_Dispatcher.cpp +endif + +CONFIG_H = $(top_builddir)/include/dbus-c++/dbus-c++-config.h HEADER_DIR = $(top_srcdir)/include/dbus-c++ HEADER_FILES = \ @@ -33,14 +40,14 @@ HEADER_FILES = \ $(HEADER_DIR)/api.h \ $(HEADER_DIR)/eventloop.h \ $(HEADER_DIR)/eventloop-integration.h \ - $(GLIB_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 $(GLIB_CPP) -libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS) +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 $(GLIB_CPP) $(ECORE_CPP) +libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS) $(ecore_LIBS) MAINTAINERCLEANFILES = \ Makefile.in diff --git a/src/connection.cpp b/src/connection.cpp index bf43a99..d56b69e 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include #include diff --git a/src/connection_p.h b/src/connection_p.h index eec96e3..1bb5fc6 100644 --- a/src/connection_p.h +++ b/src/connection_p.h @@ -26,7 +26,10 @@ #define __DBUSXX_CONNECTION_P_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/src/debug.cpp b/src/debug.cpp index 69d2d08..33ab2f4 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index bed88f8..08ee54a 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include diff --git a/src/dispatcher_p.h b/src/dispatcher_p.h index be2dea7..340ae93 100644 --- a/src/dispatcher_p.h +++ b/src/dispatcher_p.h @@ -26,7 +26,10 @@ #define __DBUSXX_DISPATCHER_P_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/src/error.cpp b/src/error.cpp index 9225117..7147d04 100644 --- a/src/error.cpp +++ b/src/error.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include #include diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp index b9a4b12..846b6e9 100644 --- a/src/eventloop-integration.cpp +++ b/src/eventloop-integration.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include #include diff --git a/src/eventloop.cpp b/src/eventloop.cpp index ae09bca..eb870fa 100644 --- a/src/eventloop.cpp +++ b/src/eventloop.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include #include diff --git a/src/glib-integration.cpp b/src/glib-integration.cpp index 42c31ea..bb6a144 100644 --- a/src/glib-integration.cpp +++ b/src/glib-integration.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include diff --git a/src/interface.cpp b/src/interface.cpp index 57a24fa..597e7a3 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include #include diff --git a/src/internalerror.h b/src/internalerror.h index 0f287e1..1bf9c59 100644 --- a/src/internalerror.h +++ b/src/internalerror.h @@ -26,7 +26,10 @@ #define __DBUSXX_INTERNALERROR_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/src/introspection.cpp b/src/introspection.cpp index f9da790..b5e794e 100644 --- a/src/introspection.cpp +++ b/src/introspection.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include #include diff --git a/src/message.cpp b/src/message.cpp index cb96694..88e04f2 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include diff --git a/src/message_p.h b/src/message_p.h index c080d01..405b9a6 100644 --- a/src/message_p.h +++ b/src/message_p.h @@ -26,7 +26,10 @@ #define __DBUSXX_MESSAGE_P_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/src/object.cpp b/src/object.cpp index b18d9cc..58fdab3 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include #include diff --git a/src/pendingcall.cpp b/src/pendingcall.cpp index 4696983..ceb7700 100644 --- a/src/pendingcall.cpp +++ b/src/pendingcall.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include diff --git a/src/pendingcall_p.h b/src/pendingcall_p.h index 0c5e7bc..a12f81c 100644 --- a/src/pendingcall_p.h +++ b/src/pendingcall_p.h @@ -26,7 +26,10 @@ #define __DBUSXX_PENDING_CALL_P_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/src/property.cpp b/src/property.cpp index bd196cd..83eeaf5 100644 --- a/src/property.cpp +++ b/src/property.cpp @@ -21,6 +21,13 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif + #include #include diff --git a/src/server.cpp b/src/server.cpp index b45845d..1a8a21c 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include #include diff --git a/src/server_p.h b/src/server_p.h index 7eb4608..6dae318 100644 --- a/src/server_p.h +++ b/src/server_p.h @@ -26,7 +26,10 @@ #define __DBUSXX_SERVER_P_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include #endif #include diff --git a/src/types.cpp b/src/types.cpp index de91655..dafd04e 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -21,6 +21,12 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_DBUSPP_CONFIG_H +#include +#endif #include #include