From ee7244181eb2e55f7c359312d5f459745d1ce800 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 15 Jun 2011 14:30:13 +0100
Subject: tools: use AM_CPPFLAGS, and wrap its lines

---
 tools/Makefile.am | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index fabb7d73..4dfb1319 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,12 @@
 configdir=$(sysconfdir)/dbus-1
 
-INCLUDES=-I$(top_srcdir) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(DBUS_X_CFLAGS) \
+	-DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" \
+	-DDBUS_COMPILATION \
+	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
+	$(NULL)
 
 # if assertions are enabled, improve backtraces
 AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
-- 
cgit v1.2.1