[master] 8da085a60 build: Squash automake warning on vmod_debug.vcc

[Dridi Boukelmoune]

commit 8da085a60559422cfdfc3f51c76f7ca61bba98e1
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Wed Oct 4 10:02:45 2023 +0200

    build: Squash automake warning on vmod_debug.vcc
    
    By conditionally setting vmod_*_vcc variables in includes we can get rid
    of a double definition warning.

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index e8c413793..c2fda1423 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -51,7 +51,7 @@ import time
 AMBOILERPLATE = '''\
 # Generated by vmodtool.py --boilerplate.
 
-vmod_XXX_vcc = $(srcdir)/VCC
+vmod_XXX_vcc ?= $(srcdir)/VCC
 
 vmod_vcc_files += $(vmod_XXX_vcc)
 
diff --git a/vmod/Makefile.am b/vmod/Makefile.am
index 694e6c284..5f3fa9250 100644
--- a/vmod/Makefile.am
+++ b/vmod/Makefile.am
@@ -20,9 +20,13 @@ AM_CPPFLAGS = \
 
 vccdir=$(datarootdir)/$(PACKAGE)/vcc
 
+# Prepare variables populated by includes
 vmod_LTLIBRARIES =
 vmod_vcc_files =
 
+# Prevent vmod_debug.vcc installation upfront
+vmod_debug_vcc =
+
 include $(srcdir)/automake_boilerplate_blob.am
 include $(srcdir)/automake_boilerplate_cookie.am
 include $(srcdir)/automake_boilerplate_debug.am
@@ -49,8 +53,6 @@ vmod_debug_symbols_regex = 'Vmod_.*_Data'
 # not --strict
 vmodtoolargs_debug = --boilerplate -o vcc_debug_if
 
-# unregister VCC file installation
 dist_noinst_DATA = $(srcdir)/vmod_debug.vcc
-vmod_debug_vcc =
 
 dist_vcc_DATA = $(vmod_vcc_files)
diff --git a/vmod/automake_boilerplate_blob.am b/vmod/automake_boilerplate_blob.am
index 7d7543650..a90e66013 100644
--- a/vmod/automake_boilerplate_blob.am
+++ b/vmod/automake_boilerplate_blob.am
@@ -1,6 +1,6 @@
 # Generated by vmodtool.py --boilerplate.
 
-vmod_blob_vcc = $(srcdir)/vmod_blob.vcc
+vmod_blob_vcc ?= $(srcdir)/vmod_blob.vcc
 
 vmod_vcc_files += $(vmod_blob_vcc)
 
diff --git a/vmod/automake_boilerplate_cookie.am b/vmod/automake_boilerplate_cookie.am
index 50e6c6409..18ba8f244 100644
--- a/vmod/automake_boilerplate_cookie.am
+++ b/vmod/automake_boilerplate_cookie.am
@@ -1,6 +1,6 @@
 # Generated by vmodtool.py --boilerplate.
 
-vmod_cookie_vcc = $(srcdir)/vmod_cookie.vcc
+vmod_cookie_vcc ?= $(srcdir)/vmod_cookie.vcc
 
 vmod_vcc_files += $(vmod_cookie_vcc)
 
diff --git a/vmod/automake_boilerplate_debug.am b/vmod/automake_boilerplate_debug.am
index 69c74062b..926ca74a4 100644
--- a/vmod/automake_boilerplate_debug.am
+++ b/vmod/automake_boilerplate_debug.am
@@ -1,6 +1,6 @@
 # Generated by vmodtool.py --boilerplate.
 
-vmod_debug_vcc = $(srcdir)/vmod_debug.vcc
+vmod_debug_vcc ?= $(srcdir)/vmod_debug.vcc
 
 vmod_vcc_files += $(vmod_debug_vcc)
 
diff --git a/vmod/automake_boilerplate_directors.am b/vmod/automake_boilerplate_directors.am
index c75f0c310..3a35af278 100644
--- a/vmod/automake_boilerplate_directors.am
+++ b/vmod/automake_boilerplate_directors.am
@@ -1,6 +1,6 @@
 # Generated by vmodtool.py --boilerplate.
 
-vmod_directors_vcc = $(srcdir)/vmod_directors.vcc
+vmod_directors_vcc ?= $(srcdir)/vmod_directors.vcc
 
 vmod_vcc_files += $(vmod_directors_vcc)
 
diff --git a/vmod/automake_boilerplate_proxy.am b/vmod/automake_boilerplate_proxy.am
index 03bc9807e..7849b193f 100644
--- a/vmod/automake_boilerplate_proxy.am
+++ b/vmod/automake_boilerplate_proxy.am
@@ -1,6 +1,6 @@
 # Generated by vmodtool.py --boilerplate.
 
-vmod_proxy_vcc = $(srcdir)/vmod_proxy.vcc
+vmod_proxy_vcc ?= $(srcdir)/vmod_proxy.vcc
 
 vmod_vcc_files += $(vmod_proxy_vcc)
 
diff --git a/vmod/automake_boilerplate_purge.am b/vmod/automake_boilerplate_purge.am
index ddf76e60d..4f82e77cc 100644
--- a/vmod/automake_boilerplate_purge.am
+++ b/vmod/automake_boilerplate_purge.am
@@ -1,6 +1,6 @@
 # Generated by vmodtool.py --boilerplate.
 
-vmod_purge_vcc = $(srcdir)/vmod_purge.vcc
+vmod_purge_vcc ?= $(srcdir)/vmod_purge.vcc
 
 vmod_vcc_files += $(vmod_purge_vcc)
 
diff --git a/vmod/automake_boilerplate_std.am b/vmod/automake_boilerplate_std.am
index 84ee4466d..25c2d0797 100644
--- a/vmod/automake_boilerplate_std.am
+++ b/vmod/automake_boilerplate_std.am
@@ -1,6 +1,6 @@
 # Generated by vmodtool.py --boilerplate.
 
-vmod_std_vcc = $(srcdir)/vmod_std.vcc
+vmod_std_vcc ?= $(srcdir)/vmod_std.vcc
 
 vmod_vcc_files += $(vmod_std_vcc)
 
diff --git a/vmod/automake_boilerplate_unix.am b/vmod/automake_boilerplate_unix.am
index 422492dd4..c7d47f074 100644
--- a/vmod/automake_boilerplate_unix.am
+++ b/vmod/automake_boilerplate_unix.am
@@ -1,6 +1,6 @@
 # Generated by vmodtool.py --boilerplate.
 
-vmod_unix_vcc = $(srcdir)/vmod_unix.vcc
+vmod_unix_vcc ?= $(srcdir)/vmod_unix.vcc
 
 vmod_vcc_files += $(vmod_unix_vcc)
 
diff --git a/vmod/automake_boilerplate_vtc.am b/vmod/automake_boilerplate_vtc.am
index 685eb2830..51d81c18f 100644
--- a/vmod/automake_boilerplate_vtc.am
+++ b/vmod/automake_boilerplate_vtc.am
@@ -1,6 +1,6 @@
 # Generated by vmodtool.py --boilerplate.
 
-vmod_vtc_vcc = $(srcdir)/vmod_vtc.vcc
+vmod_vtc_vcc ?= $(srcdir)/vmod_vtc.vcc
 
 vmod_vcc_files += $(vmod_vtc_vcc)