[Spice-commits] server/Makefile.am

[GitLab Mirror]

 server/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 832ab9709cf41b0470a9f3513def68a2792381f6
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Mar 26 12:31:02 2020 +0000

    build: Fix a warning for Autoconf
    
    Remove this warning:
    
    server/Makefile.am:5: warning: SUBDIRS was already defined in condition TRUE, which includes condition ENABLE_TESTS ...
    server/Makefile.am:2: ... 'SUBDIRS' previously defined here
    
    This was caused by the recent commit 38c7964d5365ddc
    ("build: Make building the test binaries optional under Autoconf")
    
    This problems was also causing some issues as "noinst_PROGRAMS" target
    were not compiled as expected.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/Makefile.am b/server/Makefile.am
index 3434e393..04db4e5f 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,8 +1,8 @@
 NULL =
-SUBDIRS =
+SUBDIRS = .
 
 if ENABLE_TESTS
-SUBDIRS = . tests
+SUBDIRS += tests
 
 check-valgrind:
 	$(MAKE) -C tests check-valgrind