[master] 4db4565f4 build: Add VMOD names to automake boilerplates

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Thu Jan 7 14:16:07 UTC 2021


commit 4db4565f421f3df8d57930bf8cd4fb0ea3e55017
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Jan 5 16:08:18 2021 +0100

    build: Add VMOD names to automake boilerplates
    
    This would otherwise prevent VMODs from leaving in the same directory.

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index c68b30836..956ec6165 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -81,7 +81,7 @@ PFX.h vmod_XXX.rst vmod_XXX.man.rst: PFX.c
 PFX.c: $(vmodtool) $(srcdir)/VCC
 \t at PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/VCC
 
-EXTRA_DIST = $(srcdir)/VCC automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/VCC automake_boilerplate_XXX.am
 
 CLEANFILES = $(builddir)/PFX.c $(builddir)/PFX.h \\
 \t$(builddir)/vmod_XXX.rst \\
@@ -987,7 +987,8 @@ class vcc(object):
     def amboilerplate(self):
         ''' Produce boilplate for autocrap tools '''
         vcc = os.path.basename(self.inputfile)
-        fo = self.openfile("automake_boilerplate.am")
+        fn = "automake_boilerplate_" + self.modname + ".am"
+        fo = self.openfile(fn)
         fo.write(AMBOILERPLATE.replace("XXX", self.modname)
                  .replace("VCC", vcc)
                  .replace("PFX", self.pfx))
diff --git a/lib/libvmod_blob/Makefile.am b/lib/libvmod_blob/Makefile.am
index 040b1aceb..2ca6384e9 100644
--- a/lib/libvmod_blob/Makefile.am
+++ b/lib/libvmod_blob/Makefile.am
@@ -12,4 +12,4 @@ libvmod_blob_la_SOURCES = \
 	tbl_case.h
 
 # Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate.am
+include $(srcdir)/automake_boilerplate_blob.am
diff --git a/lib/libvmod_blob/automake_boilerplate.am b/lib/libvmod_blob/automake_boilerplate_blob.am
similarity index 93%
rename from lib/libvmod_blob/automake_boilerplate.am
rename to lib/libvmod_blob/automake_boilerplate_blob.am
index 60e496959..eddb2c8b7 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate_blob.am
@@ -30,7 +30,7 @@ vcc_blob_if.h vmod_blob.rst vmod_blob.man.rst: vcc_blob_if.c
 vcc_blob_if.c: $(vmodtool) $(srcdir)/vmod_blob.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_blob.vcc
 
-EXTRA_DIST = $(srcdir)/vmod_blob.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_blob.vcc automake_boilerplate_blob.am
 
 CLEANFILES = $(builddir)/vcc_blob_if.c $(builddir)/vcc_blob_if.h \
 	$(builddir)/vmod_blob.rst \
diff --git a/lib/libvmod_cookie/Makefile.am b/lib/libvmod_cookie/Makefile.am
index e9ed0cf2e..1a0b6a6d0 100644
--- a/lib/libvmod_cookie/Makefile.am
+++ b/lib/libvmod_cookie/Makefile.am
@@ -2,4 +2,4 @@ libvmod_cookie_la_SOURCES = \
 	vmod_cookie.c
 
 # Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate.am
+include $(srcdir)/automake_boilerplate_cookie.am
diff --git a/lib/libvmod_cookie/automake_boilerplate.am b/lib/libvmod_cookie/automake_boilerplate_cookie.am
similarity index 95%
rename from lib/libvmod_cookie/automake_boilerplate.am
rename to lib/libvmod_cookie/automake_boilerplate_cookie.am
index 88d6167a6..8fbed5964 100644
--- a/lib/libvmod_cookie/automake_boilerplate.am
+++ b/lib/libvmod_cookie/automake_boilerplate_cookie.am
@@ -30,7 +30,7 @@ vcc_cookie_if.h vmod_cookie.rst vmod_cookie.man.rst: vcc_cookie_if.c
 vcc_cookie_if.c: $(vmodtool) $(srcdir)/vmod_cookie.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_cookie.vcc
 
-EXTRA_DIST = $(srcdir)/vmod_cookie.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_cookie.vcc automake_boilerplate_cookie.am
 
 CLEANFILES = $(builddir)/vcc_cookie_if.c $(builddir)/vcc_cookie_if.h \
 	$(builddir)/vmod_cookie.rst \
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index 3f902065c..687711aef 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -6,7 +6,7 @@ libvmod_debug_la_SOURCES = \
 	vmod_debug_dyn.c
 
 
-include $(srcdir)/automake_boilerplate.am
+include $(srcdir)/automake_boilerplate_debug.am
 
 # Allow Vmod_wrong*_Data to be exported
 libvmod_debug_la_LDFLAGS = \
diff --git a/lib/libvmod_debug/automake_boilerplate.am b/lib/libvmod_debug/automake_boilerplate_debug.am
similarity index 93%
rename from lib/libvmod_debug/automake_boilerplate.am
rename to lib/libvmod_debug/automake_boilerplate_debug.am
index 7850094f6..1c7f86e7b 100644
--- a/lib/libvmod_debug/automake_boilerplate.am
+++ b/lib/libvmod_debug/automake_boilerplate_debug.am
@@ -30,7 +30,7 @@ vcc_debug_if.h vmod_debug.rst vmod_debug.man.rst: vcc_debug_if.c
 vcc_debug_if.c: $(vmodtool) $(srcdir)/vmod_debug.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_debug.vcc
 
-EXTRA_DIST = $(srcdir)/vmod_debug.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_debug.vcc automake_boilerplate_debug.am
 
 CLEANFILES = $(builddir)/vcc_debug_if.c $(builddir)/vcc_debug_if.h \
 	$(builddir)/vmod_debug.rst \
diff --git a/lib/libvmod_directors/Makefile.am b/lib/libvmod_directors/Makefile.am
index 646357100..f9dc599c0 100644
--- a/lib/libvmod_directors/Makefile.am
+++ b/lib/libvmod_directors/Makefile.am
@@ -15,4 +15,4 @@ libvmod_directors_la_SOURCES = \
 	shard_dir.h
 
 # Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate.am
+include $(srcdir)/automake_boilerplate_directors.am
diff --git a/lib/libvmod_directors/automake_boilerplate.am b/lib/libvmod_directors/automake_boilerplate_directors.am
similarity index 92%
rename from lib/libvmod_directors/automake_boilerplate.am
rename to lib/libvmod_directors/automake_boilerplate_directors.am
index d84a44076..182f418e0 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate_directors.am
@@ -30,7 +30,7 @@ vcc_directors_if.h vmod_directors.rst vmod_directors.man.rst: vcc_directors_if.c
 vcc_directors_if.c: $(vmodtool) $(srcdir)/vmod_directors.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_directors.vcc
 
-EXTRA_DIST = $(srcdir)/vmod_directors.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_directors.vcc automake_boilerplate_directors.am
 
 CLEANFILES = $(builddir)/vcc_directors_if.c $(builddir)/vcc_directors_if.h \
 	$(builddir)/vmod_directors.rst \
diff --git a/lib/libvmod_proxy/Makefile.am b/lib/libvmod_proxy/Makefile.am
index d8d5861c8..c98a060f8 100644
--- a/lib/libvmod_proxy/Makefile.am
+++ b/lib/libvmod_proxy/Makefile.am
@@ -4,4 +4,4 @@ libvmod_proxy_la_SOURCES = \
 	vmod_proxy.c
 
 # Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate.am
+include $(srcdir)/automake_boilerplate_proxy.am
diff --git a/lib/libvmod_proxy/automake_boilerplate.am b/lib/libvmod_proxy/automake_boilerplate_proxy.am
similarity index 93%
rename from lib/libvmod_proxy/automake_boilerplate.am
rename to lib/libvmod_proxy/automake_boilerplate_proxy.am
index 71cd6dab3..5d744f2e8 100644
--- a/lib/libvmod_proxy/automake_boilerplate.am
+++ b/lib/libvmod_proxy/automake_boilerplate_proxy.am
@@ -30,7 +30,7 @@ vcc_proxy_if.h vmod_proxy.rst vmod_proxy.man.rst: vcc_proxy_if.c
 vcc_proxy_if.c: $(vmodtool) $(srcdir)/vmod_proxy.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_proxy.vcc
 
-EXTRA_DIST = $(srcdir)/vmod_proxy.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_proxy.vcc automake_boilerplate_proxy.am
 
 CLEANFILES = $(builddir)/vcc_proxy_if.c $(builddir)/vcc_proxy_if.h \
 	$(builddir)/vmod_proxy.rst \
diff --git a/lib/libvmod_purge/Makefile.am b/lib/libvmod_purge/Makefile.am
index 38e1e5869..7899bb056 100644
--- a/lib/libvmod_purge/Makefile.am
+++ b/lib/libvmod_purge/Makefile.am
@@ -4,4 +4,4 @@ libvmod_purge_la_SOURCES = \
 	vmod_purge.c
 
 # Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate.am
+include $(srcdir)/automake_boilerplate_purge.am
diff --git a/lib/libvmod_purge/automake_boilerplate.am b/lib/libvmod_purge/automake_boilerplate_purge.am
similarity index 93%
rename from lib/libvmod_purge/automake_boilerplate.am
rename to lib/libvmod_purge/automake_boilerplate_purge.am
index f06b85afe..259232ca9 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate_purge.am
@@ -30,7 +30,7 @@ vcc_purge_if.h vmod_purge.rst vmod_purge.man.rst: vcc_purge_if.c
 vcc_purge_if.c: $(vmodtool) $(srcdir)/vmod_purge.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_purge.vcc
 
-EXTRA_DIST = $(srcdir)/vmod_purge.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_purge.vcc automake_boilerplate_purge.am
 
 CLEANFILES = $(builddir)/vcc_purge_if.c $(builddir)/vcc_purge_if.h \
 	$(builddir)/vmod_purge.rst \
diff --git a/lib/libvmod_std/Makefile.am b/lib/libvmod_std/Makefile.am
index 8bde75239..292239d02 100644
--- a/lib/libvmod_std/Makefile.am
+++ b/lib/libvmod_std/Makefile.am
@@ -7,4 +7,4 @@ libvmod_std_la_SOURCES = \
 	vmod_std_querysort.c
 
 # Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate.am
+include $(srcdir)/automake_boilerplate_std.am
diff --git a/lib/libvmod_std/automake_boilerplate.am b/lib/libvmod_std/automake_boilerplate_std.am
similarity index 94%
rename from lib/libvmod_std/automake_boilerplate.am
rename to lib/libvmod_std/automake_boilerplate_std.am
index 5bd015b9b..aa859751c 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate_std.am
@@ -30,7 +30,7 @@ vcc_std_if.h vmod_std.rst vmod_std.man.rst: vcc_std_if.c
 vcc_std_if.c: $(vmodtool) $(srcdir)/vmod_std.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_std.vcc
 
-EXTRA_DIST = $(srcdir)/vmod_std.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_std.vcc automake_boilerplate_std.am
 
 CLEANFILES = $(builddir)/vcc_std_if.c $(builddir)/vcc_std_if.h \
 	$(builddir)/vmod_std.rst \
diff --git a/lib/libvmod_unix/Makefile.am b/lib/libvmod_unix/Makefile.am
index 8dafebac8..c68108aef 100644
--- a/lib/libvmod_unix/Makefile.am
+++ b/lib/libvmod_unix/Makefile.am
@@ -5,4 +5,4 @@ libvmod_unix_la_SOURCES = \
 	cred_compat.h
 
 # Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate.am
+include $(srcdir)/automake_boilerplate_unix.am
diff --git a/lib/libvmod_unix/automake_boilerplate.am b/lib/libvmod_unix/automake_boilerplate_unix.am
similarity index 93%
rename from lib/libvmod_unix/automake_boilerplate.am
rename to lib/libvmod_unix/automake_boilerplate_unix.am
index fa0586db3..f1256e205 100644
--- a/lib/libvmod_unix/automake_boilerplate.am
+++ b/lib/libvmod_unix/automake_boilerplate_unix.am
@@ -30,7 +30,7 @@ vcc_unix_if.h vmod_unix.rst vmod_unix.man.rst: vcc_unix_if.c
 vcc_unix_if.c: $(vmodtool) $(srcdir)/vmod_unix.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_unix.vcc
 
-EXTRA_DIST = $(srcdir)/vmod_unix.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_unix.vcc automake_boilerplate_unix.am
 
 CLEANFILES = $(builddir)/vcc_unix_if.c $(builddir)/vcc_unix_if.h \
 	$(builddir)/vmod_unix.rst \
diff --git a/lib/libvmod_vtc/Makefile.am b/lib/libvmod_vtc/Makefile.am
index 3575d7e8c..557156f6e 100644
--- a/lib/libvmod_vtc/Makefile.am
+++ b/lib/libvmod_vtc/Makefile.am
@@ -4,4 +4,4 @@ libvmod_vtc_la_SOURCES = \
 	vmod_vtc.c
 
 # Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate.am
+include $(srcdir)/automake_boilerplate_vtc.am
diff --git a/lib/libvmod_vtc/automake_boilerplate.am b/lib/libvmod_vtc/automake_boilerplate_vtc.am
similarity index 93%
rename from lib/libvmod_vtc/automake_boilerplate.am
rename to lib/libvmod_vtc/automake_boilerplate_vtc.am
index 75f8ccb1f..fd6124c01 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate_vtc.am
@@ -30,7 +30,7 @@ vcc_vtc_if.h vmod_vtc.rst vmod_vtc.man.rst: vcc_vtc_if.c
 vcc_vtc_if.c: $(vmodtool) $(srcdir)/vmod_vtc.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_vtc.vcc
 
-EXTRA_DIST = $(srcdir)/vmod_vtc.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_vtc.vcc automake_boilerplate_vtc.am
 
 CLEANFILES = $(builddir)/vcc_vtc_if.c $(builddir)/vcc_vtc_if.h \
 	$(builddir)/vmod_vtc.rst \


More information about the varnish-commit mailing list