From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 15 Jun 2011 13:25:43 +0000 (+0100)
Subject: test/name-test: use AM_CPPFLAGS instead of INCLUDES
X-Git-Tag: dbus-1.5.6~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=add0b02ee08a069b0d41d49d440ee1cee8161719;p=thirdparty%2Fdbus.git

test/name-test: use AM_CPPFLAGS instead of INCLUDES
---

diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index f4754f393..574879f1d 100644
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -1,4 +1,9 @@
-INCLUDES=-I$(top_srcdir) -DDBUS_COMPILATION
+# Everything in this directory is statically-linked to libdbus-internal
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-DDBUS_COMPILATION \
+	-DDBUS_STATIC_BUILD \
+	$(NULL)
 
 # if assertions are enabled, improve backtraces
 AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
@@ -21,7 +26,6 @@ if DBUS_BUILD_TESTS
 ## build even when not doing "make check"
 noinst_PROGRAMS=test-pending-call-dispatch test-pending-call-timeout test-threads-init test-ids test-shutdown test-privserver test-privserver-client test-autolaunch
 
-AM_CPPFLAGS = -DDBUS_STATIC_BUILD
 test_pending_call_dispatch_SOURCES =		\
 	test-pending-call-dispatch.c