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

Use autoconf convention for the configuration header (Glenn Murphy)

Browse source
This commit is contained in:
pd 2008-06-14 15:40:27 +02:00
parent 68a722e6d1
commit 1b3005836b
23 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
INSTALL
View file

@ -2,7 +2,7 @@ Installation Instructions
************************* *************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006 Free Software Foundation, Inc. 2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it. unlimited permission to copy, distribute and modify it.
@ -67,6 +67,9 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came all sorts of other programs in order to regenerate files that came
with the distribution. with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options Compilers and Options
===================== =====================

2
examples/hal/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
noinst_PROGRAMS = hal-listen noinst_PROGRAMS = hal-listen

2
examples/properties/Makefile.am
View file

@ -1,6 +1,6 @@
EXTRA_DIST = README props-introspect.xml EXTRA_DIST = README props-introspect.xml
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
noinst_PROGRAMS = props-server noinst_PROGRAMS = props-server

2
include/dbus-c++/api.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_API_H #define __DBUSXX_API_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#ifdef GCC_HASCLASSVISIBILITY #ifdef GCC_HASCLASSVISIBILITY

2
include/dbus-c++/connection.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_CONNECTION_H #define __DBUSXX_CONNECTION_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include <list> #include <list>

2
include/dbus-c++/dbus.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_DBUS_H #define __DBUSXX_DBUS_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "types.h" #include "types.h"

2
include/dbus-c++/debug.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_DEBUG_H #define __DBUSXX_DEBUG_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "api.h" #include "api.h"

2
include/dbus-c++/dispatcher.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_DISPATCHER_H #define __DBUSXX_DISPATCHER_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "api.h" #include "api.h"

2
include/dbus-c++/error.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_ERROR_H #define __DBUSXX_ERROR_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "api.h" #include "api.h"

2
include/dbus-c++/eventloop-integration.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_EVENTLOOP_INTEGRATION_H #define __DBUSXX_EVENTLOOP_INTEGRATION_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "api.h" #include "api.h"

2
include/dbus-c++/eventloop.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_EVENTLOOP_H #define __DBUSXX_EVENTLOOP_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#ifdef HAVE_PTHREAD_H #ifdef HAVE_PTHREAD_H

2
include/dbus-c++/interface.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_INTERFACE_H #define __DBUSXX_INTERFACE_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include <string> #include <string>

2
include/dbus-c++/introspection.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_INTROSPECTION_H #define __DBUSXX_INTROSPECTION_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "api.h" #include "api.h"

2
include/dbus-c++/message.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_MESSAGE_H #define __DBUSXX_MESSAGE_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include <string> #include <string>

2
include/dbus-c++/object.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_OBJECT_H #define __DBUSXX_OBJECT_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include <string> #include <string>

2
include/dbus-c++/pendingcall.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_PENDING_CALL_H #define __DBUSXX_PENDING_CALL_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "api.h" #include "api.h"

2
include/dbus-c++/property.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_PROPERTY_H #define __DBUSXX_PROPERTY_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "api.h" #include "api.h"

2
include/dbus-c++/refptr_impl.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_REFPTR_IMPL_H #define __DBUSXX_REFPTR_IMPL_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "api.h" #include "api.h"

2
include/dbus-c++/server.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_SERVER_H #define __DBUSXX_SERVER_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include <list> #include <list>

2
include/dbus-c++/types.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_TYPES_H #define __DBUSXX_TYPES_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include <string> #include <string>

2
include/dbus-c++/util.h
View file

@ -26,7 +26,7 @@
#define __DBUSXX_UTIL_H #define __DBUSXX_UTIL_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include <dbus-c++/config.h>
#endif #endif
#include "api.h" #include "api.h"

3
src/Makefile.am
View file

@ -1,7 +1,8 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(dbus_CFLAGS) \ $(dbus_CFLAGS) \
$(glib_CFLAGS) \ $(glib_CFLAGS) \
-I$(top_srcdir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/include
if ENABLE_GLIB if ENABLE_GLIB
GLIB_H = $(HEADER_DIR)/glib-integration.h GLIB_H = $(HEADER_DIR)/glib-integration.h

3
tools/Makefile.am
View file

@ -5,7 +5,8 @@ CXX = $(CXX_FOR_BUILD)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(dbus_CFLAGS) \ $(dbus_CFLAGS) \
$(xml_CFLAGS) \ $(xml_CFLAGS) \
-I$(top_srcdir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/include
if CROSS_COMPILING if CROSS_COMPILING
libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la