From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 14 Jun 2011 15:36:14 +0000 (+0100)
Subject: Remove DBUS_CLIENT_CFLAGS, which is always empty
X-Git-Tag: dbus-1.5.6~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4511023018e91457de942b31bde46984bfd5a7e;p=thirdparty%2Fdbus.git

Remove DBUS_CLIENT_CFLAGS, which is always empty
---

diff --git a/configure.ac b/configure.ac
index 382d71f86..3dc4f40b6 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 479f68865..ffe9fd2a8 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 8ac39c96c..00585a6f3 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 ce88c85f4..036b7b759 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