From 1b3005836b956607f07600e5539f952800f1c59c Mon Sep 17 00:00:00 2001 From: pd Date: Sat, 14 Jun 2008 15:40:27 +0200 Subject: [PATCH] Use autoconf convention for the configuration header (Glenn Murphy) --- INSTALL | 5 ++++- examples/hal/Makefile.am | 2 +- examples/properties/Makefile.am | 2 +- include/dbus-c++/api.h | 2 +- include/dbus-c++/connection.h | 2 +- include/dbus-c++/dbus.h | 2 +- include/dbus-c++/debug.h | 2 +- include/dbus-c++/dispatcher.h | 2 +- include/dbus-c++/error.h | 2 +- include/dbus-c++/eventloop-integration.h | 2 +- include/dbus-c++/eventloop.h | 2 +- include/dbus-c++/interface.h | 2 +- include/dbus-c++/introspection.h | 2 +- include/dbus-c++/message.h | 2 +- include/dbus-c++/object.h | 2 +- include/dbus-c++/pendingcall.h | 2 +- include/dbus-c++/property.h | 2 +- include/dbus-c++/refptr_impl.h | 2 +- include/dbus-c++/server.h | 2 +- include/dbus-c++/types.h | 2 +- include/dbus-c++/util.h | 2 +- src/Makefile.am | 3 ++- tools/Makefile.am | 3 ++- 23 files changed, 28 insertions(+), 23 deletions(-) diff --git a/INSTALL b/INSTALL index 5458714..d3c5b40 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ Installation Instructions ************************* 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 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 with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== diff --git a/examples/hal/Makefile.am b/examples/hal/Makefile.am index ed3d5c5..22868c8 100644 --- a/examples/hal/Makefile.am +++ b/examples/hal/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include noinst_PROGRAMS = hal-listen diff --git a/examples/properties/Makefile.am b/examples/properties/Makefile.am index c0c9565..6cb3ad4 100644 --- a/examples/properties/Makefile.am +++ b/examples/properties/Makefile.am @@ -1,6 +1,6 @@ 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 diff --git a/include/dbus-c++/api.h b/include/dbus-c++/api.h index c874956..9afe229 100644 --- a/include/dbus-c++/api.h +++ b/include/dbus-c++/api.h @@ -26,7 +26,7 @@ #define __DBUSXX_API_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #ifdef GCC_HASCLASSVISIBILITY diff --git a/include/dbus-c++/connection.h b/include/dbus-c++/connection.h index 5a52722..67527c8 100644 --- a/include/dbus-c++/connection.h +++ b/include/dbus-c++/connection.h @@ -26,7 +26,7 @@ #define __DBUSXX_CONNECTION_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/include/dbus-c++/dbus.h b/include/dbus-c++/dbus.h index 45de4c3..0e05e6a 100644 --- a/include/dbus-c++/dbus.h +++ b/include/dbus-c++/dbus.h @@ -26,7 +26,7 @@ #define __DBUSXX_DBUS_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "types.h" diff --git a/include/dbus-c++/debug.h b/include/dbus-c++/debug.h index 457ea5a..0096987 100644 --- a/include/dbus-c++/debug.h +++ b/include/dbus-c++/debug.h @@ -26,7 +26,7 @@ #define __DBUSXX_DEBUG_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "api.h" diff --git a/include/dbus-c++/dispatcher.h b/include/dbus-c++/dispatcher.h index 329c234..1d331cf 100644 --- a/include/dbus-c++/dispatcher.h +++ b/include/dbus-c++/dispatcher.h @@ -26,7 +26,7 @@ #define __DBUSXX_DISPATCHER_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "api.h" diff --git a/include/dbus-c++/error.h b/include/dbus-c++/error.h index d30d7c2..21540cd 100644 --- a/include/dbus-c++/error.h +++ b/include/dbus-c++/error.h @@ -26,7 +26,7 @@ #define __DBUSXX_ERROR_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "api.h" diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h index 1f5ae5e..01895a8 100644 --- a/include/dbus-c++/eventloop-integration.h +++ b/include/dbus-c++/eventloop-integration.h @@ -26,7 +26,7 @@ #define __DBUSXX_EVENTLOOP_INTEGRATION_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "api.h" diff --git a/include/dbus-c++/eventloop.h b/include/dbus-c++/eventloop.h index 592e46a..4ee9bc5 100644 --- a/include/dbus-c++/eventloop.h +++ b/include/dbus-c++/eventloop.h @@ -26,7 +26,7 @@ #define __DBUSXX_EVENTLOOP_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #ifdef HAVE_PTHREAD_H diff --git a/include/dbus-c++/interface.h b/include/dbus-c++/interface.h index a59785a..ea10d57 100644 --- a/include/dbus-c++/interface.h +++ b/include/dbus-c++/interface.h @@ -26,7 +26,7 @@ #define __DBUSXX_INTERFACE_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/include/dbus-c++/introspection.h b/include/dbus-c++/introspection.h index 00a33b0..baae4a0 100644 --- a/include/dbus-c++/introspection.h +++ b/include/dbus-c++/introspection.h @@ -26,7 +26,7 @@ #define __DBUSXX_INTROSPECTION_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "api.h" diff --git a/include/dbus-c++/message.h b/include/dbus-c++/message.h index a287ab8..a10fbd0 100644 --- a/include/dbus-c++/message.h +++ b/include/dbus-c++/message.h @@ -26,7 +26,7 @@ #define __DBUSXX_MESSAGE_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/include/dbus-c++/object.h b/include/dbus-c++/object.h index 43ad7cc..f597a42 100644 --- a/include/dbus-c++/object.h +++ b/include/dbus-c++/object.h @@ -26,7 +26,7 @@ #define __DBUSXX_OBJECT_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/include/dbus-c++/pendingcall.h b/include/dbus-c++/pendingcall.h index d7c64b8..f7d0da6 100644 --- a/include/dbus-c++/pendingcall.h +++ b/include/dbus-c++/pendingcall.h @@ -26,7 +26,7 @@ #define __DBUSXX_PENDING_CALL_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "api.h" diff --git a/include/dbus-c++/property.h b/include/dbus-c++/property.h index 28e1846..d074167 100644 --- a/include/dbus-c++/property.h +++ b/include/dbus-c++/property.h @@ -26,7 +26,7 @@ #define __DBUSXX_PROPERTY_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "api.h" diff --git a/include/dbus-c++/refptr_impl.h b/include/dbus-c++/refptr_impl.h index bf42f40..363f065 100644 --- a/include/dbus-c++/refptr_impl.h +++ b/include/dbus-c++/refptr_impl.h @@ -26,7 +26,7 @@ #define __DBUSXX_REFPTR_IMPL_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "api.h" diff --git a/include/dbus-c++/server.h b/include/dbus-c++/server.h index 4597610..4259e30 100644 --- a/include/dbus-c++/server.h +++ b/include/dbus-c++/server.h @@ -26,7 +26,7 @@ #define __DBUSXX_SERVER_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/include/dbus-c++/types.h b/include/dbus-c++/types.h index f90f980..aad9703 100644 --- a/include/dbus-c++/types.h +++ b/include/dbus-c++/types.h @@ -26,7 +26,7 @@ #define __DBUSXX_TYPES_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/include/dbus-c++/util.h b/include/dbus-c++/util.h index a22f267..9f2807a 100644 --- a/include/dbus-c++/util.h +++ b/include/dbus-c++/util.h @@ -26,7 +26,7 @@ #define __DBUSXX_UTIL_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "api.h" diff --git a/src/Makefile.am b/src/Makefile.am index 64bb40f..f449e9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,8 @@ AM_CPPFLAGS = \ $(dbus_CFLAGS) \ $(glib_CFLAGS) \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + -I$(top_builddir)/include if ENABLE_GLIB GLIB_H = $(HEADER_DIR)/glib-integration.h diff --git a/tools/Makefile.am b/tools/Makefile.am index d6044a1..8ee021c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -5,7 +5,8 @@ CXX = $(CXX_FOR_BUILD) AM_CPPFLAGS = \ $(dbus_CFLAGS) \ $(xml_CFLAGS) \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + -I$(top_builddir)/include if CROSS_COMPILING libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la