Use autoconf convention for the configuration header (Glenn Murphy)
This commit is contained in:
parent
68a722e6d1
commit
1b3005836b
23 changed files with 28 additions and 23 deletions
5
INSTALL
5
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
|
||||
=====================
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
|
||||
|
||||
noinst_PROGRAMS = hal-listen
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_API_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#ifdef GCC_HASCLASSVISIBILITY
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_CONNECTION_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include <list>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_DBUS_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "types.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_DEBUG_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "api.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_DISPATCHER_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "api.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_ERROR_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "api.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_EVENTLOOP_INTEGRATION_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "api.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_EVENTLOOP_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_PTHREAD_H
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_INTERFACE_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_INTROSPECTION_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "api.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_MESSAGE_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_OBJECT_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_PENDING_CALL_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "api.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_PROPERTY_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "api.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_REFPTR_IMPL_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "api.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_SERVER_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include <list>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_TYPES_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __DBUSXX_UTIL_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#include <dbus-c++/config.h>
|
||||
#endif
|
||||
|
||||
#include "api.h"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue