Commit 8da085a6 authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

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.
parent 2df4639f
...@@ -51,7 +51,7 @@ import time ...@@ -51,7 +51,7 @@ import time
AMBOILERPLATE = '''\ AMBOILERPLATE = '''\
# Generated by vmodtool.py --boilerplate. # Generated by vmodtool.py --boilerplate.
vmod_XXX_vcc = $(srcdir)/VCC vmod_XXX_vcc ?= $(srcdir)/VCC
vmod_vcc_files += $(vmod_XXX_vcc) vmod_vcc_files += $(vmod_XXX_vcc)
......
...@@ -20,9 +20,13 @@ AM_CPPFLAGS = \ ...@@ -20,9 +20,13 @@ AM_CPPFLAGS = \
vccdir=$(datarootdir)/$(PACKAGE)/vcc vccdir=$(datarootdir)/$(PACKAGE)/vcc
# Prepare variables populated by includes
vmod_LTLIBRARIES = vmod_LTLIBRARIES =
vmod_vcc_files = vmod_vcc_files =
# Prevent vmod_debug.vcc installation upfront
vmod_debug_vcc =
include $(srcdir)/automake_boilerplate_blob.am include $(srcdir)/automake_boilerplate_blob.am
include $(srcdir)/automake_boilerplate_cookie.am include $(srcdir)/automake_boilerplate_cookie.am
include $(srcdir)/automake_boilerplate_debug.am include $(srcdir)/automake_boilerplate_debug.am
...@@ -49,8 +53,6 @@ vmod_debug_symbols_regex = 'Vmod_.*_Data' ...@@ -49,8 +53,6 @@ vmod_debug_symbols_regex = 'Vmod_.*_Data'
# not --strict # not --strict
vmodtoolargs_debug = --boilerplate -o vcc_debug_if vmodtoolargs_debug = --boilerplate -o vcc_debug_if
# unregister VCC file installation
dist_noinst_DATA = $(srcdir)/vmod_debug.vcc dist_noinst_DATA = $(srcdir)/vmod_debug.vcc
vmod_debug_vcc =
dist_vcc_DATA = $(vmod_vcc_files) dist_vcc_DATA = $(vmod_vcc_files)
# Generated by vmodtool.py --boilerplate. # 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) vmod_vcc_files += $(vmod_blob_vcc)
......
# Generated by vmodtool.py --boilerplate. # 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) vmod_vcc_files += $(vmod_cookie_vcc)
......
# Generated by vmodtool.py --boilerplate. # 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) vmod_vcc_files += $(vmod_debug_vcc)
......
# Generated by vmodtool.py --boilerplate. # 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) vmod_vcc_files += $(vmod_directors_vcc)
......
# Generated by vmodtool.py --boilerplate. # 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) vmod_vcc_files += $(vmod_proxy_vcc)
......
# Generated by vmodtool.py --boilerplate. # 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) vmod_vcc_files += $(vmod_purge_vcc)
......
# Generated by vmodtool.py --boilerplate. # 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) vmod_vcc_files += $(vmod_std_vcc)
......
# Generated by vmodtool.py --boilerplate. # 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) vmod_vcc_files += $(vmod_unix_vcc)
......
# Generated by vmodtool.py --boilerplate. # 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) vmod_vcc_files += $(vmod_vtc_vcc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment