From 368e150afc8c71fd94f90643f7079d20cdc7f913 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 18 Jan 2003 14:41:37 +0000 Subject: 2003-01-18 Havoc Pennington * configure.in: default --enable-tests to $USE_MAINTAINER_MODE * dbus/Makefile.am: fix it up so dubs-test-main.c is included in the distribution * test/Makefile.am: don't use special variable "TESTS" for echo-* since we don't want to use those in make check --- dbus/Makefile.am | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'dbus/Makefile.am') diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 3457534d..955b793f 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -73,14 +73,20 @@ libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) libdbus-convenience.la ## convention for internal symbols) libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" +## note that TESTS has special meaning (stuff to use in make check) +## so if adding tests not to be run in make check, don't add them to +## TESTS if DBUS_BUILD_TESTS -noinst_PROGRAMS=dbus-test +TESTS=dbus-test +else +TESTS= +endif + +## we use noinst_PROGRAMS not check_PROGRAMS so that we build +## even when not doing "make check" +noinst_PROGRAMS=$(TESTS) dbus_test_SOURCES= \ dbus-test-main.c dbus_test_LDADD= $(DBUS_CLIENT_LIBS) libdbus-convenience.la libdbus-1.la - -## so that "make check" works -TESTS=dbus-test -endif -- cgit