[master] 7fda13213 build: Turn the $(vmodtool) make variable uppercase

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Mon May 15 16:42:06 UTC 2023


commit 7fda13213009357d2efd24513445e0707c2c47f2
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Apr 3 17:23:56 2023 +0200

    build: Turn the $(vmodtool) make variable uppercase
    
    This is the convention for command line programs used in makefiles, like
    CC, LD and plenty others. This is also what varnish.m4 exposes to out of
    tree projects.

diff --git a/configure.ac b/configure.ac
index 70aa89818..ff51ab9ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -644,7 +644,7 @@ AC_SUBST(pkgsysconfdir)
 
 # VMOD variables
 AC_SUBST(vmoddir, [$\(pkglibdir\)/vmods])
-AC_SUBST(vmodtool, [$\(top_srcdir\)/lib/libvcc/vmodtool.py])
+AC_SUBST(VMODTOOL, [$\(top_srcdir\)/lib/libvcc/vmodtool.py])
 
 # Check for linker script support
 gl_LD_VERSION_SCRIPT
diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 884ad4fa5..58fbc3041 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -82,8 +82,8 @@ PFX.h vmod_XXX.rst vmod_XXX.man.rst: PFX.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-PFX.c: $(vmodtool) $(srcdir)/VCC
-\t at PYTHON@ $(vmodtool) $(vmodtoolargs_XXX) $(srcdir)/VCC
+PFX.c: $(VMODTOOL) $(srcdir)/VCC
+\t at PYTHON@ $(VMODTOOL) $(vmodtoolargs_XXX) $(srcdir)/VCC
 \ttouch PFX.c
 
 clean-local: clean-vmod-XXX
diff --git a/vmod/automake_boilerplate_blob.am b/vmod/automake_boilerplate_blob.am
index 1b7c375a5..7d7543650 100644
--- a/vmod/automake_boilerplate_blob.am
+++ b/vmod/automake_boilerplate_blob.am
@@ -38,8 +38,8 @@ vcc_blob_if.h vmod_blob.rst vmod_blob.man.rst: vcc_blob_if.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-vcc_blob_if.c: $(vmodtool) $(srcdir)/vmod_blob.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs_blob) $(srcdir)/vmod_blob.vcc
+vcc_blob_if.c: $(VMODTOOL) $(srcdir)/vmod_blob.vcc
+	@PYTHON@ $(VMODTOOL) $(vmodtoolargs_blob) $(srcdir)/vmod_blob.vcc
 	touch vcc_blob_if.c
 
 clean-local: clean-vmod-blob
diff --git a/vmod/automake_boilerplate_cookie.am b/vmod/automake_boilerplate_cookie.am
index 1cb5c9f46..50e6c6409 100644
--- a/vmod/automake_boilerplate_cookie.am
+++ b/vmod/automake_boilerplate_cookie.am
@@ -31,8 +31,8 @@ vcc_cookie_if.h vmod_cookie.rst vmod_cookie.man.rst: vcc_cookie_if.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-vcc_cookie_if.c: $(vmodtool) $(srcdir)/vmod_cookie.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs_cookie) $(srcdir)/vmod_cookie.vcc
+vcc_cookie_if.c: $(VMODTOOL) $(srcdir)/vmod_cookie.vcc
+	@PYTHON@ $(VMODTOOL) $(vmodtoolargs_cookie) $(srcdir)/vmod_cookie.vcc
 	touch vcc_cookie_if.c
 
 clean-local: clean-vmod-cookie
diff --git a/vmod/automake_boilerplate_debug.am b/vmod/automake_boilerplate_debug.am
index b5c34f75e..69c74062b 100644
--- a/vmod/automake_boilerplate_debug.am
+++ b/vmod/automake_boilerplate_debug.am
@@ -34,8 +34,8 @@ vcc_debug_if.h vmod_debug.rst vmod_debug.man.rst: vcc_debug_if.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-vcc_debug_if.c: $(vmodtool) $(srcdir)/vmod_debug.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs_debug) $(srcdir)/vmod_debug.vcc
+vcc_debug_if.c: $(VMODTOOL) $(srcdir)/vmod_debug.vcc
+	@PYTHON@ $(VMODTOOL) $(vmodtoolargs_debug) $(srcdir)/vmod_debug.vcc
 	touch vcc_debug_if.c
 
 clean-local: clean-vmod-debug
diff --git a/vmod/automake_boilerplate_directors.am b/vmod/automake_boilerplate_directors.am
index ed44678ac..c75f0c310 100644
--- a/vmod/automake_boilerplate_directors.am
+++ b/vmod/automake_boilerplate_directors.am
@@ -41,8 +41,8 @@ vcc_directors_if.h vmod_directors.rst vmod_directors.man.rst: vcc_directors_if.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-vcc_directors_if.c: $(vmodtool) $(srcdir)/vmod_directors.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs_directors) $(srcdir)/vmod_directors.vcc
+vcc_directors_if.c: $(VMODTOOL) $(srcdir)/vmod_directors.vcc
+	@PYTHON@ $(VMODTOOL) $(vmodtoolargs_directors) $(srcdir)/vmod_directors.vcc
 	touch vcc_directors_if.c
 
 clean-local: clean-vmod-directors
diff --git a/vmod/automake_boilerplate_proxy.am b/vmod/automake_boilerplate_proxy.am
index 61b54e785..03bc9807e 100644
--- a/vmod/automake_boilerplate_proxy.am
+++ b/vmod/automake_boilerplate_proxy.am
@@ -31,8 +31,8 @@ vcc_proxy_if.h vmod_proxy.rst vmod_proxy.man.rst: vcc_proxy_if.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-vcc_proxy_if.c: $(vmodtool) $(srcdir)/vmod_proxy.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs_proxy) $(srcdir)/vmod_proxy.vcc
+vcc_proxy_if.c: $(VMODTOOL) $(srcdir)/vmod_proxy.vcc
+	@PYTHON@ $(VMODTOOL) $(vmodtoolargs_proxy) $(srcdir)/vmod_proxy.vcc
 	touch vcc_proxy_if.c
 
 clean-local: clean-vmod-proxy
diff --git a/vmod/automake_boilerplate_purge.am b/vmod/automake_boilerplate_purge.am
index de5cbc6c4..ddf76e60d 100644
--- a/vmod/automake_boilerplate_purge.am
+++ b/vmod/automake_boilerplate_purge.am
@@ -31,8 +31,8 @@ vcc_purge_if.h vmod_purge.rst vmod_purge.man.rst: vcc_purge_if.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-vcc_purge_if.c: $(vmodtool) $(srcdir)/vmod_purge.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs_purge) $(srcdir)/vmod_purge.vcc
+vcc_purge_if.c: $(VMODTOOL) $(srcdir)/vmod_purge.vcc
+	@PYTHON@ $(VMODTOOL) $(vmodtoolargs_purge) $(srcdir)/vmod_purge.vcc
 	touch vcc_purge_if.c
 
 clean-local: clean-vmod-purge
diff --git a/vmod/automake_boilerplate_std.am b/vmod/automake_boilerplate_std.am
index b4f62fde6..84ee4466d 100644
--- a/vmod/automake_boilerplate_std.am
+++ b/vmod/automake_boilerplate_std.am
@@ -34,8 +34,8 @@ vcc_std_if.h vmod_std.rst vmod_std.man.rst: vcc_std_if.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-vcc_std_if.c: $(vmodtool) $(srcdir)/vmod_std.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs_std) $(srcdir)/vmod_std.vcc
+vcc_std_if.c: $(VMODTOOL) $(srcdir)/vmod_std.vcc
+	@PYTHON@ $(VMODTOOL) $(vmodtoolargs_std) $(srcdir)/vmod_std.vcc
 	touch vcc_std_if.c
 
 clean-local: clean-vmod-std
diff --git a/vmod/automake_boilerplate_unix.am b/vmod/automake_boilerplate_unix.am
index aff2650f4..422492dd4 100644
--- a/vmod/automake_boilerplate_unix.am
+++ b/vmod/automake_boilerplate_unix.am
@@ -32,8 +32,8 @@ vcc_unix_if.h vmod_unix.rst vmod_unix.man.rst: vcc_unix_if.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-vcc_unix_if.c: $(vmodtool) $(srcdir)/vmod_unix.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs_unix) $(srcdir)/vmod_unix.vcc
+vcc_unix_if.c: $(VMODTOOL) $(srcdir)/vmod_unix.vcc
+	@PYTHON@ $(VMODTOOL) $(vmodtoolargs_unix) $(srcdir)/vmod_unix.vcc
 	touch vcc_unix_if.c
 
 clean-local: clean-vmod-unix
diff --git a/vmod/automake_boilerplate_vtc.am b/vmod/automake_boilerplate_vtc.am
index 202ad2257..685eb2830 100644
--- a/vmod/automake_boilerplate_vtc.am
+++ b/vmod/automake_boilerplate_vtc.am
@@ -31,8 +31,8 @@ vcc_vtc_if.h vmod_vtc.rst vmod_vtc.man.rst: vcc_vtc_if.c
 
 # A doc-change will not update mtime on the .h and .c files, so a
 # touch(1) is necessary to signal that vmodtool was in fact run.
-vcc_vtc_if.c: $(vmodtool) $(srcdir)/vmod_vtc.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs_vtc) $(srcdir)/vmod_vtc.vcc
+vcc_vtc_if.c: $(VMODTOOL) $(srcdir)/vmod_vtc.vcc
+	@PYTHON@ $(VMODTOOL) $(vmodtoolargs_vtc) $(srcdir)/vmod_vtc.vcc
 	touch vcc_vtc_if.c
 
 clean-local: clean-vmod-vtc


More information about the varnish-commit mailing list