From 2ef1957776e50b1ce5fa912bd9163afbc4626174 Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Wed, 10 Jul 2013 17:46:08 +0800 Subject: [PATCH v2 1/3] TEST: do not build test only files into internal libdbus Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66753 Signed-off-by: Chengwei Yang --- dbus/Makefile.am | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dbus/Makefile.am b/dbus/Makefile.am index e118cbb..93f8ed0 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -208,8 +208,8 @@ DBUS_LIB_SOURCES= \ DBUS_SHARED_SOURCES= \ dbus-dataslot.c \ dbus-dataslot.h \ - dbus-file.c \ - dbus-file.h \ + dbus-file.c \ + dbus-file.h \ dbus-hash.c \ dbus-hash.h \ dbus-internals.c \ @@ -221,8 +221,8 @@ DBUS_SHARED_SOURCES= \ dbus-memory.c \ dbus-mempool.c \ dbus-mempool.h \ - dbus-pipe.c \ - dbus-pipe.h \ + dbus-pipe.c \ + dbus-pipe.h \ dbus-string.c \ dbus-string.h \ dbus-string-private.h \ @@ -239,15 +239,9 @@ DBUS_SHARED_SOURCES= \ DBUS_UTIL_SOURCES= \ dbus-asv-util.c \ dbus-asv-util.h \ - dbus-auth-script.c \ - dbus-auth-script.h \ - dbus-auth-util.c \ - dbus-credentials-util.c \ dbus-mainloop.c \ dbus-mainloop.h \ - dbus-marshal-byteswap-util.c \ dbus-marshal-recursive-util.c \ - dbus-marshal-validate-util.c \ dbus-message-factory.c \ dbus-message-factory.h \ dbus-message-util.c \ @@ -259,9 +253,7 @@ DBUS_UTIL_SOURCES= \ dbus-socket-set-poll.c \ dbus-spawn.h \ dbus-string-util.c \ - dbus-sysdeps-util.c \ - dbus-test.c \ - dbus-test.h + dbus-sysdeps-util.c libdbus_1_la_SOURCES= \ $(DBUS_LIB_SOURCES) \ @@ -316,7 +308,15 @@ noinst_PROGRAMS += dbus-test endif dbus_test_SOURCES= \ - dbus-test-main.c + dbus-test-main.c \ + dbus-auth-script.c \ + dbus-auth-script.h \ + dbus-auth-util.c \ + dbus-credentials-util.c \ + dbus-marshal-byteswap-util.c \ + dbus-marshal-validate-util.c \ + dbus-test.c \ + dbus-test.h dbus_test_LDADD = libdbus-internal.la -- 1.7.9.5