refs test: fix unused variable

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

diff --git a/test/Makefile.am b/test/Makefile.am
index ad8b6a1..d69e783 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,12 +4,29 @@
 SUBDIRS= . name-test 
 DIST_SUBDIRS=name-test
 
-INCLUDES=-I$(top_srcdir)
+AM_CPPFLAGS = \
+       -I$(top_srcdir) \
+       $(GLIB_CFLAGS) \
+       $(DBUS_GLIB_CFLAGS) \
+       $(NULL)
 
 # improve backtraces from test stuff
 AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
-libdbus_testutils_la_SOURCES = test-utils.h test-utils.c
+static_cppflags = \
+       $(AM_CPPFLAGS) \
+       -DDBUS_STATIC_BUILD \
+       $(NULL)
+
+libdbus_testutils_la_CPPFLAGS = \
+       $(static_cppflags)
+libdbus_testutils_la_SOURCES = \
+       test-utils.c \
+       test-utils.h \
+       $(NULL)
+libdbus_testutils_la_LIBADD = \
+       $(top_builddir)/dbus/libdbus-internal.la \
+       $(NULL)
 
 noinst_LTLIBRARIES = libdbus-testutils.la
 
@@ -55,44 +72,27 @@ endif !DBUS_BUILD_TESTS
 
 noinst_PROGRAMS= $(TEST_BINARIES)
 
-test_service_SOURCES=                          \
-       test-service.c
-
-test_names_SOURCES=                            \
-       test-names.c
-
-##break_loader_SOURCES=                                \
-##     break-loader.c
-
-test_shell_service_SOURCES =                   \
-       test-shell-service.c
-
-shell_test_SOURCES=                             \
-        shell-test.c
-
-spawn_test_SOURCES=                            \
-       spawn-test.c
-
-test_exit_SOURCES =                            \
-       test-exit.c
-
-test_segfault_SOURCES =                                \
-       test-segfault.c
-
-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
-
-test_service_LDADD = libdbus-testutils.la $(top_builddir)/dbus/libdbus-internal.la
-test_names_LDADD = libdbus-testutils.la $(top_builddir)/dbus/libdbus-internal.la
+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_LDADD = libdbus-testutils.la $(top_builddir)/dbus/libdbus-internal.la
-shell_test_LDADD = libdbus-testutils.la $(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
 
+test_refs_SOURCES = internals/refs.c
+test_refs_CPPFLAGS = $(static_cppflags)
+test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS)
+
+test_syslog_SOURCES = internals/syslog.c
+test_syslog_CPPFLAGS = $(static_cppflags)
+test_syslog_LDADD = libdbus-testutils.la $(GLIB_LIBS)
+
 EXTRA_DIST = dbus-test-runner
 
 testexecdir = $(libdir)/dbus-1.0/test
@@ -105,7 +105,9 @@ installable_tests = \
        test-dbus-daemon-eavesdrop \
        test-loopback \
        test-marshal \
+       test-refs \
        test-relay \
+       test-syslog \
        $(NULL)
 
 installcheck_tests =
@@ -122,25 +124,21 @@ TESTS_ENVIRONMENT = \
        $(NULL)
 
 test_corrupt_SOURCES = corrupt.c
-test_corrupt_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 test_corrupt_LDADD = $(top_builddir)/dbus/libdbus-1.la \
     $(GLIB_LIBS) \
     $(DBUS_GLIB_LIBS)
 
 test_loopback_SOURCES = loopback.c
-test_loopback_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 test_loopback_LDADD = $(top_builddir)/dbus/libdbus-1.la \
     $(GLIB_LIBS) \
     $(DBUS_GLIB_LIBS)
 
 test_relay_SOURCES = relay.c
-test_relay_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 test_relay_LDADD = $(top_builddir)/dbus/libdbus-1.la \
     $(GLIB_LIBS) \
     $(DBUS_GLIB_LIBS)
 
 test_dbus_daemon_SOURCES = dbus-daemon.c
-test_dbus_daemon_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 test_dbus_daemon_LDADD = $(top_builddir)/dbus/libdbus-1.la \
     $(GLIB_LIBS) \
     $(DBUS_GLIB_LIBS)
@@ -153,7 +151,6 @@ test_dbus_daemon_eavesdrop_LDADD = $(top_builddir)/dbus/libdbus-1.la \
     $(DBUS_GLIB_LIBS)
 
 test_marshal_SOURCES = marshal.c
-test_marshal_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
 test_marshal_LDADD = $(top_builddir)/dbus/libdbus-1.la \
     $(GLIB_LIBS) \
     $(DBUS_GLIB_LIBS)
@@ -266,6 +263,8 @@ clean-local:
                        REVERSEDIRS="$$D $$REVERSEDIRS" ;               \
                done ;                                                  \
                for D in $$REVERSEDIRS; do                              \
-                       rmdir $(top_builddir)/test/$$D || exit 1 ;      \
+                       rmdir $(top_builddir)/test/$$D ||               \
+                               test ! -d $(top_builddir)/test/$$D ||   \
+                               exit 1 ;        \
                done ;                                                  \
        fi