diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-14 16:36:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:06:07 +0100 |
| commit | b4511023018e91457de942b31bde46984bfd5a7e (patch) | |
| tree | fae0b2b5184ce2f888ce7a2f30e0937e4b62e874 | |
| parent | fa9bf406b408e2310703612a83bd0aa63c116ace (diff) | |
| download | dbus-b4511023018e91457de942b31bde46984bfd5a7e.tar.gz | |
Remove DBUS_CLIENT_CFLAGS, which is always empty
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | dbus/Makefile.am | 1 | ||||
| -rw-r--r-- | test/name-test/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 382d71f8..3dc4f40b 100644 --- a/configure.ac +++ b/configure.ac @@ -1125,9 +1125,7 @@ if test x$dbus_win = xyes ; then fi #### Set up final flags -DBUS_CLIENT_CFLAGS= DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_libs" -AC_SUBST(DBUS_CLIENT_CFLAGS) AC_SUBST(DBUS_CLIENT_LIBS) DBUS_BUS_CFLAGS="$XML_CFLAGS" diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 479f6886..ffe9fd2a 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -2,7 +2,6 @@ configdir=$(sysconfdir)/dbus-1 INCLUDES = -I$(top_builddir) -I$(top_srcdir) \ - $(DBUS_CLIENT_CFLAGS) \ -DDBUS_COMPILATION \ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 8ac39c96..00585a6f 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPILATION +INCLUDES=-I$(top_srcdir) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPILATION ## note that TESTS has special meaning (stuff to use in make check) ## so if adding tests not to be run in make check, don't add them to diff --git a/tools/Makefile.am b/tools/Makefile.am index ce88c85f..036b7b75 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,6 +1,6 @@ configdir=$(sysconfdir)/dbus-1 -INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" +INCLUDES=-I$(top_srcdir) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" extra_bin_programs= if DBUS_UNIX |