[Spice-devel] [PATCH spice 2/2] build-sys: fix make distcheck

[Marc-André Lureau]

---
 server/tests/Makefile.am |   44 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index bc4e00e..ff0e3ed 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -13,21 +13,51 @@ if SUPPORT_AUTOMATED_TESTS
 INCLUDES += -DAUTOMATED_TESTS
 endif
 
-AM_LDFLAGS = $(top_builddir)/server/libspice-server.la
+LDADD =							\
+	$(top_builddir)/common/libspice-common.la	\
+	$(top_builddir)/server/libspice-server.la	\
+	$(NULL)
 
-COMMON_BASE=basic_event_loop.c basic_event_loop.h test_util.h ../../common/backtrace.c
+COMMON_BASE =					\
+	basic_event_loop.c			\
+	basic_event_loop.h			\
+	test_util.h				\
+	$(NULL)
 
+noinst_PROGRAMS =				\
+	test_display_no_ssl			\
+	test_display_streaming			\
+	test_empty_success			\
+	test_fail_on_null_core_interface	\
+	test_just_sockets_no_ssl		\
+	test_playback				\
+	$(NULL)
 
-noinst_PROGRAMS = test_just_sockets_no_ssl test_empty_success test_fail_on_null_core_interface test_display_no_ssl test_display_streaming test_playback
+test_display_streaming_SOURCES =		\
+	$(COMMON_BASE)				\
+	test_display_base.c			\
+	test_display_base.h			\
+	test_display_streaming.c		\
+	$(NULL)
 
-test_display_streaming_SOURCES = test_display_streaming.c test_display_base.c test_display_base.h $(COMMON_BASE)
+test_display_no_ssl_SOURCES =			\
+	$(COMMON_BASE)				\
+	test_display_base.c			\
+	test_display_base.h			\
+	test_display_no_ssl.c 			\
+	$(NULL)
 
-test_display_no_ssl_SOURCES = test_display_no_ssl.c test_display_base.c test_display_base.h $(COMMON_BASE)
+test_just_sockets_no_ssl_SOURCES =		\
+	$(COMMON_BASE)				\
+	test_just_sockets_no_ssl.c		\
+	$(NULL)
 
-test_just_sockets_no_ssl_SOURCES = test_just_sockets_no_ssl.c $(COMMON_BASE)
+test_playback_SOURCES =				\
+	$(COMMON_BASE)				\
+	test_playback.c				\
+	$(NULL)
 
 test_empty_success_SOURCES = test_empty_success.c
 
 test_fail_on_null_core_interface_SOURCES = test_fail_on_null_core_interface.c
 
-test_playback_SOURCES = test_playback.c $(COMMON_BASE)
-- 
1.7.7.6