summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bus/Makefile.am2
-rw-r--r--dbus/Makefile.am1
-rw-r--r--test/Makefile.am1
-rw-r--r--test/name-test/Makefile.am1
4 files changed, 4 insertions, 1 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am
index 0b9998da..1db7c9e1 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -18,11 +18,11 @@ DBUS_LAUNCHER_LIBS = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
+ $(DBUS_STATIC_BUILD_CPPFLAGS) \
$(XML_CFLAGS) \
$(APPARMOR_CFLAGS) \
-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
-DDBUS_COMPILATION \
- -DDBUS_STATIC_BUILD \
$(NULL)
# if assertions are enabled, improve backtraces
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 56668d30..e5a5688a 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -4,6 +4,7 @@ configdir=$(sysconfdir)/dbus-1
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
+ $(DBUS_STATIC_BUILD_CPPFLAGS) \
$(SYSTEMD_CFLAGS) \
$(VALGRIND_CFLAGS) \
-DDBUS_COMPILATION \
diff --git a/test/Makefile.am b/test/Makefile.am
index 723d7767..54bcd868 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,6 +6,7 @@ DIST_SUBDIRS=name-test
AM_CPPFLAGS = \
-I$(top_srcdir) \
+ $(DBUS_STATIC_BUILD_CPPFLAGS) \
-DDBUS_COMPILATION \
$(GLIB_CFLAGS) \
$(NULL)
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index b28a7e86..c6611aa3 100644
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = \
-I$(top_srcdir) \
+ $(DBUS_STATIC_BUILD_CPPFLAGS) \
-DDBUS_COMPILATION \
$(NULL)