fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-23 09:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: reverse assumption regarding static/dynamic linking

Browse source 
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.
This commit is contained in:
Simon McVittie 2011-06-15 14:21:14 +01:00
parent e5b9bc3a6b
commit 9875480ed4
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
test/Makefile.am
View file

@ -88,15 +88,22 @@ test_segfault_SOURCES = \
test_sleep_forever_SOURCES = \ test_sleep_forever_SOURCES = \
test-sleep-forever.c test-sleep-forever.c
# This assumes that most tests will be linked to libdbus-internal; static_cppflags = \
# tests linked to only the public libdbus have their own CPPFLAGS. $(AM_CPPFLAGS) \
AM_CPPFLAGS=-DDBUS_STATIC_BUILD -DDBUS_STATIC_BUILD \
$(NULL)
test_service_CPPFLAGS = $(static_cppflags)
test_service_LDADD = libdbus-testutils.la test_service_LDADD = libdbus-testutils.la
test_names_CPPFLAGS = $(static_cppflags)
test_names_LDADD = libdbus-testutils.la test_names_LDADD = libdbus-testutils.la
## break_loader_CPPFLAGS = $(static_cppflags)
## break_loader_LDADD = $(top_builddir)/dbus/libdbus-internal.la ## break_loader_LDADD = $(top_builddir)/dbus/libdbus-internal.la
test_shell_service_CPPFLAGS = $(static_cppflags)
test_shell_service_LDADD = libdbus-testutils.la test_shell_service_LDADD = libdbus-testutils.la
shell_test_CPPFLAGS = $(static_cppflags)
shell_test_LDADD = libdbus-testutils.la shell_test_LDADD = libdbus-testutils.la
spawn_test_CPPFLAGS = $(static_cppflags)
spawn_test_LDADD = $(top_builddir)/dbus/libdbus-internal.la spawn_test_LDADD = $(top_builddir)/dbus/libdbus-internal.la
EXTRA_DIST = dbus-test-runner EXTRA_DIST = dbus-test-runner