[master] 03a36ac7e Polish contrib Makefile

Nils Goroll nils.goroll at uplex.de
Mon Sep 19 13:26:05 UTC 2022


commit 03a36ac7eaa73e14a4de33d5cbe688456e14525f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Sep 17 13:43:04 2022 +0200

    Polish contrib Makefile
    
    Avoid this warning:
    
    autoreconf2.69: running: automake --add-missing --copy --no-force
    vtc.am:12: warning: 'TEST_EXTENSIONS' cannot have conditional contents
    contrib/Makefile.am:12:   'vtc.am' included from here
    
    Always defining the tests even if contrib is not built should not cause
    any harm.

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 59607f5bf..889d3f5ca 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,5 +1,7 @@
 #
 
+include $(top_srcdir)/vtc.am
+
 if !WITH_CONTRIB
 dist_noinst_SCRIPTS = \
 	varnishstatdiff
@@ -9,7 +11,6 @@ dist_bin_SCRIPTS = \
 
 TESTS = @CONTRIB_TESTS@
 
-include $(top_srcdir)/vtc.am
 endif
 
 EXTRA_DIST = @CONTRIB_TESTS@


More information about the varnish-commit mailing list