[daemon-fix] fixed getting uid and pid when transport is not kdbus

[platform/upstream/dbus.git] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index 4866b32..281b3e2 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -19,19 +19,41 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 static_cppflags = \
        $(AM_CPPFLAGS) \
        -DDBUS_STATIC_BUILD \
+       -DDBUS_COMPILATION \
+       -DDBUS_TEST_USE_INTERNAL \
        $(NULL)
 
-libdbus_testutils_la_CPPFLAGS = \
-       $(static_cppflags)
+noinst_LTLIBRARIES = libdbus-testutils-internal.la
+
+# You can link either libdbus-testutils, dbus-glib and libdbus-1,
+# or libdbus-testutils-internal and libdbus-internal - never both in the
+# same binary.
+if DBUS_WITH_DBUS_GLIB
+noinst_LTLIBRARIES += libdbus-testutils.la
 libdbus_testutils_la_SOURCES = \
        test-utils.c \
        test-utils.h \
        $(NULL)
 libdbus_testutils_la_LIBADD = \
-       $(top_builddir)/dbus/libdbus-internal.la \
+       $(top_builddir)/dbus/libdbus-1.la \
+       $(GLIB_LIBS) \
+       $(DBUS_GLIB_LIBS) \
        $(NULL)
+testutils_shared_if_possible = libdbus-testutils.la
+else
+testutils_shared_if_possible = libdbus-testutils-internal.la
+endif
 
-noinst_LTLIBRARIES = libdbus-testutils.la
+libdbus_testutils_internal_la_CPPFLAGS = \
+       $(static_cppflags) \
+       $(NULL)
+libdbus_testutils_internal_la_SOURCES = \
+       test-utils.c \
+       test-utils.h \
+       $(NULL)
+libdbus_testutils_internal_la_LIBADD = \
+       $(top_builddir)/dbus/libdbus-internal.la \
+       $(NULL)
 
 if DBUS_ENABLE_EMBEDDED_TESTS
 ## break-loader removed for now
@@ -69,15 +91,15 @@ endif !DBUS_ENABLE_EMBEDDED_TESTS
 noinst_PROGRAMS= $(TEST_BINARIES)
 
 test_service_CPPFLAGS = $(static_cppflags)
-test_service_LDADD = libdbus-testutils.la
+test_service_LDADD = libdbus-testutils-internal.la
 test_names_CPPFLAGS = $(static_cppflags)
-test_names_LDADD = libdbus-testutils.la
+test_names_LDADD = libdbus-testutils-internal.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
+test_shell_service_LDADD = libdbus-testutils-internal.la
 shell_test_CPPFLAGS = $(static_cppflags)
-shell_test_LDADD = libdbus-testutils.la
+shell_test_LDADD = libdbus-testutils-internal.la
 spawn_test_CPPFLAGS = $(static_cppflags)
 spawn_test_LDADD = $(top_builddir)/dbus/libdbus-internal.la
 
@@ -87,11 +109,11 @@ test_printf_LDADD = $(top_builddir)/dbus/libdbus-internal.la
 
 test_refs_SOURCES = internals/refs.c
 test_refs_CPPFLAGS = $(static_cppflags)
-test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS)
+test_refs_LDADD = libdbus-testutils-internal.la $(GLIB_LIBS)
 
 test_syslog_SOURCES = internals/syslog.c
 test_syslog_CPPFLAGS = $(static_cppflags)
-test_syslog_LDADD = libdbus-testutils.la $(GLIB_LIBS)
+test_syslog_LDADD = libdbus-testutils-internal.la $(GLIB_LIBS)
 
 EXTRA_DIST = dbus-test-runner
 
@@ -103,7 +125,7 @@ installable_tests = \
        shell-test \
        test-printf \
        $(NULL)
-installable_manual_tests += \
+installable_manual_tests = \
        $(NULL)
 
 if DBUS_WITH_GLIB
@@ -138,45 +160,52 @@ TESTS_ENVIRONMENT = \
        $(NULL)
 
 manual_authz_SOURCES = manual-authz.c
-manual_authz_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+manual_authz_LDADD = \
+    $(testutils_shared_if_possible) \
     $(GLIB_LIBS) \
-    $(DBUS_GLIB_LIBS)
+    $(NULL)
 
 test_corrupt_SOURCES = corrupt.c
-test_corrupt_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+test_corrupt_LDADD = \
+    $(testutils_shared_if_possible) \
     $(GLIB_LIBS) \
-    $(DBUS_GLIB_LIBS)
+    $(NULL)
 
 test_loopback_SOURCES = loopback.c
-test_loopback_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+test_loopback_LDADD = \
+    $(testutils_shared_if_possible) \
     $(GLIB_LIBS) \
-    $(DBUS_GLIB_LIBS)
+    $(NULL)
 
 test_relay_SOURCES = relay.c
-test_relay_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+test_relay_LDADD = \
+    $(testutils_shared_if_possible) \
     $(GLIB_LIBS) \
-    $(DBUS_GLIB_LIBS)
+    $(NULL)
 
 test_dbus_daemon_SOURCES = dbus-daemon.c
-test_dbus_daemon_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+test_dbus_daemon_LDADD = \
+    $(testutils_shared_if_possible) \
     $(GLIB_LIBS) \
-    $(DBUS_GLIB_LIBS)
+    $(NULL)
 
 test_dbus_daemon_eavesdrop_SOURCES = dbus-daemon-eavesdrop.c
-test_dbus_daemon_eavesdrop_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
-test_dbus_daemon_eavesdrop_LDFLAGS = @R_DYNAMIC_LDFLAG@
-test_dbus_daemon_eavesdrop_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+test_dbus_daemon_eavesdrop_LDADD = \
+    $(testutils_shared_if_possible) \
     $(GLIB_LIBS) \
-    $(DBUS_GLIB_LIBS)
+    $(NULL)
 
 test_marshal_SOURCES = marshal.c
-test_marshal_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+test_marshal_LDADD = \
+    $(top_builddir)/dbus/libdbus-1.la \
     $(GLIB_LIBS) \
-    $(DBUS_GLIB_LIBS)
+    $(NULL)
 
 test_syntax_SOURCES = syntax.c
-test_syntax_LDADD = $(top_builddir)/dbus/libdbus-1.la \
-    $(GLIB_LIBS)
+test_syntax_LDADD = \
+    $(top_builddir)/dbus/libdbus-1.la \
+    $(GLIB_LIBS) \
+    $(NULL)
 
 if DBUS_ENABLE_MODULAR_TESTS
 TESTS += $(installable_tests)