diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-03 12:16:32 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-05 12:35:29 +0100 |
| commit | 87df259d8c4aae3d188a15d7976c0f63141119e8 (patch) | |
| tree | 7a2a7053e4c51910337602ef128d7429a51ef8d2 | |
| parent | 9d80d46a794e0770494aa517d1b94e7e6ea9e21d (diff) | |
| download | dbus-87df259d8c4aae3d188a15d7976c0f63141119e8.tar.gz | |
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>
| -rw-r--r-- | test/Makefile.am | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 281b3e2e..405aa1c2 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) |