build: Add VMOD names to automake boilerplates

This would otherwise prevent VMODs from leaving in the same directory.

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@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))

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

lib/libvmod_blob/automake_boilerplate.am → 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 \

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

lib/libvmod_cookie/automake_boilerplate.am → 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 \

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 = \

lib/libvmod_debug/automake_boilerplate.am → 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 \

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

lib/libvmod_directors/automake_boilerplate.am → 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 \

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

lib/libvmod_proxy/automake_boilerplate.am → 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 \

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

lib/libvmod_purge/automake_boilerplate.am → 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 \

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

lib/libvmod_std/automake_boilerplate.am → 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 \

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

lib/libvmod_unix/automake_boilerplate.am → 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 \

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

lib/libvmod_vtc/automake_boilerplate.am → 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 \