dbusinclude_HEADERS= \
dbus.h \
+ dbus-address.h \
+ dbus-bus.h \
+ dbus-connection.h \
+ dbus-dict.h \
dbus-errors.h \
dbus-macros.h \
dbus-memory.h \
dbus-types.h
libdbus_1_la_SOURCES= \
+ dbus-address.c \
dbus-auth.c \
dbus-auth.h \
+ dbus-auth-script.c \
+ dbus-auth-script.h \
+ dbus-bus.c \
dbus-connection.c \
- dbus-connection.h \
dbus-connection-internal.h \
+ dbus-dict.c \
dbus-errors.c \
+ dbus-keyring.c \
+ dbus-keyring.h \
dbus-memory.c \
dbus-message.c \
dbus-message-handler.c \
dbus-message-internal.h \
+ dbus-resources.c \
+ dbus-resources.h \
dbus-server.c \
dbus-server-protected.h \
+ dbus-server-debug.c \
+ dbus-server-debug.h \
dbus-server-unix.c \
dbus-server-unix.h \
+ dbus-sha.c \
+ dbus-sha.h \
+ dbus-test.c \
+ dbus-test.h \
+ dbus-timeout.c \
+ dbus-timeout.h \
dbus-threads.c \
dbus-transport.c \
dbus-transport.h \
+ dbus-transport-debug.c \
+ dbus-transport-debug.h \
dbus-transport-protected.h \
dbus-transport-unix.c \
dbus-transport-unix.h \
dbus-watch.c \
dbus-watch.h
+## dbus-md5.c \
+## dbus-md5.h \
+
## this library is linked into both libdbus and the bus
## itself, but does not export any symbols from libdbus.
noinst_LTLIBRARIES=libdbus-convenience.la
libdbus_convenience_la_SOURCES= \
+ dbus-dataslot.c \
+ dbus-dataslot.h \
dbus-hash.c \
dbus-hash.h \
dbus-internals.c \
dbus-marshal.h \
dbus-mempool.c \
dbus-mempool.h \
+ dbus-message-builder.c \
+ dbus-message-builder.h \
dbus-string.c \
dbus-string.h \
+ dbus-string-private.h \
dbus-sysdeps.c \
dbus-sysdeps.h
libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) libdbus-convenience.la
## don't export symbols that start with "_" (we use this
## convention for internal symbols)
-libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
+#libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
+
+## FIXME it would be less annoying when hacking if we didn't have
+## to relink these test binaries, so moving them to the test/*
+## subdir would be nice.
+## 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_ENVIRONMENT=DBUS_TEST_DATA=$(top_srcdir)/test/data
+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.c \
- dbus-test.h
+ 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
+## mop up the gcov files
+clean-local:
+ /bin/rm *.bb *.bbg *.da *.gcov || true