From 5d667056198d3ecb37dd5b7779229f370b080174 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 20 Feb 2015 16:14:08 +0000 Subject: [PATCH] Fix static linking with mingw Now that we're normally linking libdbus-1 dynamically, we need to use DBUS_STATIC_BUILD_CPPFLAGS in every Makefile that would normally link it dynamically, but might link it statically if we are only building static libraries. --- bus/Makefile.am | 2 +- dbus/Makefile.am | 1 + test/Makefile.am | 1 + test/name-test/Makefile.am | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index 0b9998d..1db7c9e 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 56668d3..e5a5688 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 723d776..54bcd86 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 b28a7e8..c6611aa 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) -- 2.1.4