many changes

This commit is contained in:
Andreas Volz 2008-07-22 22:34:47 +02:00
parent af6e9da658
commit 7841877d64
49 changed files with 208 additions and 221 deletions

View file

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

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h>
#include <dbus-c++/connection.h>

View file

@ -26,7 +26,10 @@
#define __DBUSXX_CONNECTION_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/connection.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/dispatcher.h>

View file

@ -26,7 +26,10 @@
#define __DBUSXX_DISPATCHER_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/dispatcher.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/message.h>
#include <dbus-c++/error.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/eventloop-integration.h>
#include <dbus-c++/debug.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/eventloop.h>
#include <dbus-c++/debug.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/glib-integration.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h>
#include <dbus-c++/interface.h>

View file

@ -26,7 +26,10 @@
#define __DBUSXX_INTERNALERROR_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/error.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/introspection.h>
#include <dbus-c++/object.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/message.h>

View file

@ -26,7 +26,10 @@
#define __DBUSXX_MESSAGE_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/message.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h>
#include <dbus-c++/object.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/pendingcall.h>

View file

@ -26,7 +26,10 @@
#define __DBUSXX_PENDING_CALL_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/pendingcall.h>

View file

@ -21,6 +21,13 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h>
#include <dbus-c++/property.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/debug.h>
#include <dbus-c++/server.h>

View file

@ -26,7 +26,10 @@
#define __DBUSXX_SERVER_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/server.h>

View file

@ -21,6 +21,12 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_DBUSPP_CONFIG_H
#include <dbus-c++/dbus-c++-config.h>
#endif
#include <dbus-c++/types.h>
#include <dbus-c++/object.h>