Commit 2ca78f51 authored by Simon McVittie's avatar Simon McVittie

tests: simplify Makefile.am now that libdbus is always dynamically linked

testutils_shared_if_possible_cppflags is now just a copy of AM_CPPFLAGS,
which is the default and does not need to be given explicitly, so
those lines can be removed.

Similarly, testutils_shared_if_possible_libs is just the
libdbus-testutils.la convenience library, so expand it and
remove the unnecessary variable.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83115Reviewed-by: Ralf Habacker's avatarRalf Habacker <ralf.habacker@freenet.de>
parent 6c433c0d
......@@ -28,9 +28,6 @@ libdbus_testutils_la_SOURCES += \
$(NULL)
endif
testutils_shared_if_possible_cppflags = $(AM_CPPFLAGS)
testutils_shared_if_possible_libs = libdbus-testutils.la
libdbus_testutils_la_LIBADD = \
$(top_builddir)/dbus/libdbus-1.la \
$(top_builddir)/dbus/libdbus-internal.la \
......@@ -159,85 +156,74 @@ TESTS_ENVIRONMENT = \
$(NULL)
manual_authz_SOURCES = manual-authz.c
manual_authz_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
manual_authz_LDADD = \
$(testutils_shared_if_possible_libs) \
libdbus-testutils.la \
$(GLIB_LIBS) \
$(NULL)
test_corrupt_SOURCES = corrupt.c
test_corrupt_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
test_corrupt_LDADD = \
$(testutils_shared_if_possible_libs) \
libdbus-testutils.la \
$(GLIB_LIBS) \
$(NULL)
test_loopback_SOURCES = loopback.c
test_loopback_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
test_loopback_LDADD = \
$(testutils_shared_if_possible_libs) \
libdbus-testutils.la \
$(GLIB_LIBS) \
$(NULL)
test_relay_SOURCES = relay.c
test_relay_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
test_relay_LDADD = \
$(testutils_shared_if_possible_libs) \
libdbus-testutils.la \
$(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_libs) \
libdbus-testutils.la \
$(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_libs) \
libdbus-testutils.la \
$(GLIB_LIBS) \
$(NULL)
test_sd_activation_SOURCES = \
sd-activation.c \
$(NULL)
test_sd_activation_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
test_sd_activation_LDADD = \
$(testutils_shared_if_possible_libs) \
libdbus-testutils.la \
$(GLIB_LIBS) \
$(NULL)
test_marshal_SOURCES = marshal.c
test_marshal_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
test_marshal_LDADD = \
$(testutils_shared_if_possible_libs) \
libdbus-testutils.la \
$(GLIB_LIBS) \
$(NULL)
test_monitor_SOURCES = \
monitor.c \
$(NULL)
test_monitor_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
test_monitor_LDADD = \
$(testutils_shared_if_possible_libs) \
libdbus-testutils.la \
$(GLIB_LIBS) \
$(NULL)
test_syntax_SOURCES = syntax.c
test_syntax_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
test_syntax_LDADD = \
$(testutils_shared_if_possible_libs) \
libdbus-testutils.la \
$(GLIB_LIBS) \
$(NULL)
test_uid_permissions_SOURCES = \
uid-permissions.c \
$(NULL)
test_uid_permissions_CPPFLAGS = $(testutils_shared_if_possible_cppflags)
test_uid_permissions_LDADD = \
$(testutils_shared_if_possible_libs) \
libdbus-testutils.la \
$(GLIB_LIBS) \
$(NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment