summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-06-14 16:35:08 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-07-29 11:05:34 +0100
commitfa9bf406b408e2310703612a83bd0aa63c116ace (patch)
tree73397651705b8b04e210550c7d7b67433147f784
parentff6b4929168ba6bf38d60b1a720ae55392c12451 (diff)
downloaddbus-fa9bf406b408e2310703612a83bd0aa63c116ace.tar.gz
Remove DBUS_TEST_CFLAGS, which is empty
-rw-r--r--configure.ac2
-rw-r--r--test/Makefile.am2
-rw-r--r--test/name-test/Makefile.am2
3 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index c9ebd115..382d71f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1140,9 +1140,7 @@ DBUS_LAUNCHER_LIBS="$XML_LIBS $THREAD_LIBS $NETWORK_libs"
AC_SUBST(DBUS_LAUNCHER_CFLAGS)
AC_SUBST(DBUS_LAUNCHER_LIBS)
-DBUS_TEST_CFLAGS=
DBUS_TEST_LIBS="$THREAD_LIBS $NETWORK_libs"
-AC_SUBST(DBUS_TEST_CFLAGS)
AC_SUBST(DBUS_TEST_LIBS)
### X11 detection
diff --git a/test/Makefile.am b/test/Makefile.am
index 187a239a..699f6df3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,7 +4,7 @@
SUBDIRS= . name-test
DIST_SUBDIRS=name-test
-INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS)
+INCLUDES=-I$(top_srcdir)
libdbus_testutils_la_SOURCES = test-utils.h test-utils.c
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index 5f11f0be..8ac39c96 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) $(DBUS_TEST_CFLAGS) -DDBUS_COMPILATION
+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(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