From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 3 Sep 2013 11:16:32 +0000 (+0100)
Subject: Add CPPFLAGS to "shared if possible" test binaries
X-Git-Tag: dbus-1.7.6~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87df259d8c4aae3d188a15d7976c0f63141119e8;p=thirdparty%2Fdbus.git

Add CPPFLAGS to "shared if possible" test binaries

In principle we ought to define DBUS_STATIC_BUILD in anything that's
using libdbus-internal.la (to avoid linking failures on
statically-linked mingw builds), and DBUS_TEST_USE_INTERNAL in any
test that's using the non-dbus-glib code paths of test-utils.[ch]
(to avoid the GLib requirement, although in practice, everything
"shared if possible" requires GLib at the moment anyway).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/test/Makefile.am b/test/Makefile.am
index 281b3e2e5..405aa1c2d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -39,9 +39,11 @@ libdbus_testutils_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(DBUS_GLIB_LIBS) \
 	$(NULL)
-testutils_shared_if_possible = libdbus-testutils.la
+testutils_shared_if_possible_cppflags = $(AM_CPPFLAGS)
+testutils_shared_if_possible_libs = libdbus-testutils.la
 else
-testutils_shared_if_possible = libdbus-testutils-internal.la
+testutils_shared_if_possible_cppflags = $(static_cppflags)
+testutils_shared_if_possible_libs = libdbus-testutils-internal.la
 endif
 
 libdbus_testutils_internal_la_CPPFLAGS = \
@@ -160,38 +162,44 @@ TESTS_ENVIRONMENT = \
 	$(NULL)
 
 manual_authz_SOURCES = manual-authz.c
+manual_authz_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
 manual_authz_LDADD = \
-    $(testutils_shared_if_possible) \
+    $(testutils_shared_if_possible_libs) \
     $(GLIB_LIBS) \
     $(NULL)
 
 test_corrupt_SOURCES = corrupt.c
+test_corrupt_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
 test_corrupt_LDADD = \
-    $(testutils_shared_if_possible) \
+    $(testutils_shared_if_possible_libs) \
     $(GLIB_LIBS) \
     $(NULL)
 
 test_loopback_SOURCES = loopback.c
+test_loopback_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
 test_loopback_LDADD = \
-    $(testutils_shared_if_possible) \
+    $(testutils_shared_if_possible_libs) \
     $(GLIB_LIBS) \
     $(NULL)
 
 test_relay_SOURCES = relay.c
+test_relay_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
 test_relay_LDADD = \
-    $(testutils_shared_if_possible) \
+    $(testutils_shared_if_possible_libs) \
     $(GLIB_LIBS) \
     $(NULL)
 
 test_dbus_daemon_SOURCES = dbus-daemon.c
+test_dbus_daemon_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
 test_dbus_daemon_LDADD = \
-    $(testutils_shared_if_possible) \
+    $(testutils_shared_if_possible_libs) \
     $(GLIB_LIBS) \
     $(NULL)
 
 test_dbus_daemon_eavesdrop_SOURCES = dbus-daemon-eavesdrop.c
+test_dbus_daemon_eavesdrop_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
 test_dbus_daemon_eavesdrop_LDADD = \
-    $(testutils_shared_if_possible) \
+    $(testutils_shared_if_possible_libs) \
     $(GLIB_LIBS) \
     $(NULL)