fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-08 10:18:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add CPPFLAGS to "shared if possible" test binaries

Browse source 
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>
This commit is contained in:
Simon McVittie 2013-09-03 12:16:32 +01:00
parent 9d80d46a79
commit 87df259d8c
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
test/Makefile.am
View file

@ -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)