tools: use AM_CPPFLAGS, and wrap its lines
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 15 Jun 2011 13:30:13 +0000 (14:30 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 29 Jul 2011 10:49:18 +0000 (11:49 +0100)
tools/Makefile.am

index fabb7d7..4dfb131 100644 (file)
@@ -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@