Define DBUS_COMPILATION externally for all tests that use internal stuff

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

diff --git a/test/Makefile.am b/test/Makefile.am
index 6f0e6e1..fe163c6 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -19,6 +19,7 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 static_cppflags = \
        $(AM_CPPFLAGS) \
        -DDBUS_STATIC_BUILD \
+       -DDBUS_COMPILATION \
        $(NULL)
 
 libdbus_testutils_la_CPPFLAGS = \
@@ -33,7 +34,7 @@ libdbus_testutils_la_LIBADD = \
 
 noinst_LTLIBRARIES = libdbus-testutils.la
 
-if DBUS_BUILD_TESTS
+if DBUS_ENABLE_EMBEDDED_TESTS
 ## break-loader removed for now
 ## these binaries are used in tests but are not themselves tests
 TEST_BINARIES = \
@@ -59,12 +60,12 @@ if DBUS_UNIX
 TESTS += ../bus/bus-test-launch-helper$(EXEEXT)
 endif
 
-else !DBUS_BUILD_TESTS
+else !DBUS_ENABLE_EMBEDDED_TESTS
 
 TEST_BINARIES=
 TESTS=
 
-endif !DBUS_BUILD_TESTS
+endif !DBUS_ENABLE_EMBEDDED_TESTS
 
 noinst_PROGRAMS= $(TEST_BINARIES)
 
@@ -103,6 +104,8 @@ installable_tests = \
        shell-test \
        test-printf \
        $(NULL)
+installable_manual_tests = \
+       $(NULL)
 
 if DBUS_WITH_GLIB
 installable_tests += \
@@ -116,6 +119,9 @@ installable_tests += \
        test-syntax \
        test-syslog \
        $(NULL)
+installable_manual_tests += \
+       manual-authz \
+       $(NULL)
 endif DBUS_WITH_GLIB
 
 installcheck_tests =
@@ -132,6 +138,11 @@ TESTS_ENVIRONMENT = \
        DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \
        $(NULL)
 
+manual_authz_SOURCES = manual-authz.c
+manual_authz_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+    $(GLIB_LIBS) \
+    $(DBUS_GLIB_LIBS)
+
 test_corrupt_SOURCES = corrupt.c
 test_corrupt_LDADD = $(top_builddir)/dbus/libdbus-1.la \
     $(GLIB_LIBS) \
@@ -173,9 +184,9 @@ TESTS += $(installable_tests)
 installcheck_tests += $(installable_tests)
 
 if DBUS_ENABLE_INSTALLED_TESTS
-  testexec_PROGRAMS += $(installable_tests)
+  testexec_PROGRAMS += $(installable_tests) $(installable_manual_tests)
 else !DBUS_ENABLE_INSTALLED_TESTS
-  noinst_PROGRAMS += $(installable_tests)
+  noinst_PROGRAMS += $(installable_tests) $(installable_manual_tests)
 endif !DBUS_ENABLE_INSTALLED_TESTS
 
 endif DBUS_ENABLE_MODULAR_TESTS