summaryrefslogtreecommitdiff
path: root/bus/Makefile.am
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-06-15 14:14:34 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-07-29 11:17:22 +0100
commite5b9bc3a6b1d1f9edeec644152146d548f9cfdfd (patch)
treed84ba3cf7dfd50afa6c95b15a62711e285088166 /bus/Makefile.am
parent274e0fbc20a9639201c64830c7eca7a5cea97e73 (diff)
downloaddbus-e5b9bc3a6b1d1f9edeec644152146d548f9cfdfd.tar.gz
bus: use AM_CPPFLAGS to simplify preprocessor invocation
Everything in this directory is statically linked to libdbus-internal, so we can make -DDBUS_STATIC_BUILD global. Also, merge INCLUDES into AM_CPPFLAGS (it's an older name for the same functionality).
Diffstat (limited to 'bus/Makefile.am')
-rw-r--r--bus/Makefile.am17
1 files changed, 9 insertions, 8 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am
index c83c80ac..6cbc09a6 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -15,10 +15,13 @@ DBUS_LAUNCHER_LIBS = \
$(NETWORK_libs) \
$(NULL)
-INCLUDES = -I$(top_srcdir) \
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
$(XML_CFLAGS) \
-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
- -DDBUS_COMPILATION
+ -DDBUS_COMPILATION \
+ -DDBUS_STATIC_BUILD \
+ $(NULL)
# if assertions are enabled, improve backtraces
AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
@@ -102,7 +105,6 @@ dbus_daemon_SOURCES= \
$(BUS_SOURCES) \
main.c
-dbus_daemon_CPPFLAGS = -DDBUS_STATIC_BUILD
dbus_daemon_LDADD= \
$(top_builddir)/dbus/libdbus-internal.la \
$(EFENCE) \
@@ -127,7 +129,6 @@ dbus_daemon_launch_helper_SOURCES= \
activation-helper-bin.c \
$(LAUNCH_HELPER_SOURCES)
-dbus_daemon_launch_helper_CPPFLAGS = -DDBUS_STATIC_BUILD
dbus_daemon_launch_helper_LDADD= \
$(top_builddir)/dbus/libdbus-internal.la \
$(DBUS_LAUNCHER_LIBS)
@@ -142,7 +143,8 @@ dbus_daemon_launch_helper_test_LDADD= \
$(top_builddir)/dbus/libdbus-internal.la \
$(DBUS_LAUNCHER_LIBS)
-dbus_daemon_launch_helper_test_CPPFLAGS= -DDBUS_STATIC_BUILD \
+dbus_daemon_launch_helper_test_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DACTIVATION_LAUNCHER_TEST
## we build yet another binary so we can do the OOM tests
@@ -155,7 +157,8 @@ bus_test_launch_helper_LDADD= \
$(top_builddir)/dbus/libdbus-internal.la \
$(DBUS_LAUNCHER_LIBS)
-bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD \
+bus_test_launch_helper_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DACTIVATION_LAUNCHER_TEST \
-DACTIVATION_LAUNCHER_DO_OOM
@@ -196,14 +199,12 @@ bus_test_system_SOURCES= \
utils.h \
test-system.c
-bus_test_system_CPPFLAGS = -DDBUS_STATIC_BUILD
bus_test_system_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS)
bus_test_SOURCES= \
$(BUS_SOURCES) \
test-main.c
-bus_test_CPPFLAGS = -DDBUS_STATIC_BUILD
bus_test_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS)
## mop up the gcov files