diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-15 14:21:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:17:29 +0100 |
| commit | 9875480ed476f3c8ff3c7bdc35430342c440633e (patch) | |
| tree | 0669dbfb15890fa1068278d738b0f6076df80a75 | |
| parent | e5b9bc3a6b1d1f9edeec644152146d548f9cfdfd (diff) | |
| download | dbus-9875480ed476f3c8ff3c7bdc35430342c440633e.tar.gz | |
test: reverse assumption regarding static/dynamic linking
If we change the default assumption to be that new tests will be
dynamically-linked to libdbus, those tests can be useful for
installcheck or even for installation. Accordingly, explicitly use
new variable $(static_cppflags) for all tests that need static linking.
| -rw-r--r-- | test/Makefile.am | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 0448dca8..fd687cd7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -88,15 +88,22 @@ test_segfault_SOURCES = \ test_sleep_forever_SOURCES = \ test-sleep-forever.c -# This assumes that most tests will be linked to libdbus-internal; -# tests linked to only the public libdbus have their own CPPFLAGS. -AM_CPPFLAGS=-DDBUS_STATIC_BUILD +static_cppflags = \ + $(AM_CPPFLAGS) \ + -DDBUS_STATIC_BUILD \ + $(NULL) +test_service_CPPFLAGS = $(static_cppflags) test_service_LDADD = libdbus-testutils.la +test_names_CPPFLAGS = $(static_cppflags) test_names_LDADD = libdbus-testutils.la +## break_loader_CPPFLAGS = $(static_cppflags) ## break_loader_LDADD = $(top_builddir)/dbus/libdbus-internal.la +test_shell_service_CPPFLAGS = $(static_cppflags) test_shell_service_LDADD = libdbus-testutils.la +shell_test_CPPFLAGS = $(static_cppflags) shell_test_LDADD = libdbus-testutils.la +spawn_test_CPPFLAGS = $(static_cppflags) spawn_test_LDADD = $(top_builddir)/dbus/libdbus-internal.la EXTRA_DIST = dbus-test-runner |