Put not trivial program in separate sections making easier to understand the relationship between macros. Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx> --- server/tests/Makefile.am | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am index 2efc136d4..f57040e89 100644 --- a/server/tests/Makefile.am +++ b/server/tests/Makefile.am @@ -67,30 +67,17 @@ noinst_PROGRAMS = \ test-display-resolution-changes \ test-two-servers \ test-display-width-stride \ - spice-server-replay \ $(check_PROGRAMS) \ $(NULL) -if HAVE_GSTREAMER -noinst_PROGRAMS += test-gst -endif - TESTS = $(check_PROGRAMS) \ $(NULL) -if ENABLE_EXTRA_CHECKS -if HAVE_GSTREAMER_1_0 -TESTS += video-encoders -endif -endif -EXTRA_DIST += video-encoders +test_qxl_parsing_LDADD = ../libserver.la $(LDADD) -noinst_LIBRARIES += \ - libtest-stat1.a \ - libtest-stat2.a \ - libtest-stat3.a \ - libtest-stat4.a \ - $(NULL) +## spice-server-replay + +noinst_PROGRAMS += spice-server-replay spice_server_replay_SOURCES = replay.c \ ../event-loop.c \ @@ -105,6 +92,15 @@ spice_server_replay_LDADD = \ $(SPICE_NONPKGCONFIG_LIBS) \ $(NULL) +## test-stat + +noinst_LIBRARIES += \ + libtest-stat1.a \ + libtest-stat2.a \ + libtest-stat3.a \ + libtest-stat4.a \ + $(NULL) + test_stat_SOURCES = stat-main.c test_stat_LDADD = \ libtest-stat1.a \ @@ -126,9 +122,15 @@ libtest_stat3_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORK libtest_stat4_a_SOURCES = stat-test.c libtest_stat4_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORKER_STAT=1 -DTEST_NAME=stat_test4 -test_qxl_parsing_LDADD = ../libserver.la $(LDADD) +## test-gst (helper) and video-encoders (test) if HAVE_GSTREAMER +noinst_PROGRAMS += test-gst + +if ENABLE_EXTRA_CHECKS +TESTS += video-encoders +endif + test_gst_SOURCES = test-gst.c \ $(NULL) test_gst_CPPFLAGS = \ @@ -137,3 +139,5 @@ test_gst_CPPFLAGS = \ $(GSTREAMER_1_0_CFLAGS) \ $(NULL) endif + +EXTRA_DIST += video-encoders -- 2.13.5 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel