Advanced
Mailing List Archive

Mailing List Archive

  1. Home >
  2. Varnish>
  3. Commits
[master] 7cd4c2427 build: Rename VMOD sources to avoid collisions
dridi.boukelmoune at gmail
Jun 30, 2020, 2:54 AM
Post #1 of 1 (46 views)
Permalink
commit 7cd4c242795f3832ade51b254e7ab38f98e778ad
Author: Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
Date: Mon Jun 29 17:28:36 2020 +0200

build: Rename VMOD sources to avoid collisions

Instead of calling all VCC files vmod.vcc they were renamed to
vmod_foo.vcc and instead of generating vcc_if.[ch] we do the same
thing with vcc_foo_if.[ch].

This a manual mechanical change that will then be picked up by
vmodtool's automake boilerplate generator.

Better diff with the --word-diff --word-diff-regex=. options.

diff --git a/.gitignore b/.gitignore
index c476a47dc..e261781ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,8 +73,8 @@ cscope.*out
# Misc. generated files for included vmods.
/lib/libvmod_*/VSC_*.c
/lib/libvmod_*/VSC_*.h
-/lib/libvmod_*/vcc_if.c
-/lib/libvmod_*/vcc_if.h
+/lib/libvmod_*/vcc_*_if.c
+/lib/libvmod_*/vcc_*_if.h
/lib/libvmod_*/vmod_*.rst

# Man-files and binaries
diff --git a/lib/libvmod_blob/automake_boilerplate.am b/lib/libvmod_blob/automake_boilerplate.am
index 0ff3f4f98..3da6b00a1 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include

vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_if
+vmodtoolargs ?= --strict --boilerplate -o vcc_blob_if

vmod_LTLIBRARIES = libvmod_blob.la

@@ -21,17 +21,17 @@ libvmod_blob_la_LDFLAGS = \
$(VMOD_LDFLAGS) \
@SAN_LDFLAGS@

-nodist_libvmod_blob_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_blob_la_SOURCES = vcc_blob_if.c vcc_blob_if.h

-$(libvmod_blob_la_OBJECTS): vcc_if.h
+$(libvmod_blob_la_OBJECTS): vcc_blob_if.h

-vcc_if.h vmod_blob.rst vmod_blob.man.rst: vcc_if.c
+vcc_blob_if.h vmod_blob.rst vmod_blob.man.rst: vcc_blob_if.c

-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+vcc_blob_if.c: $(vmodtool) $(srcdir)/vmod_blob.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_blob.vcc

-EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_blob.vcc automake_boilerplate.am

-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+CLEANFILES = $(builddir)/vcc_blob_if.c $(builddir)/vcc_blob_if.h \
$(builddir)/vmod_blob.rst \
$(builddir)/vmod_blob.man.rst
diff --git a/lib/libvmod_blob/vmod_blob.c b/lib/libvmod_blob/vmod_blob.c
index ec4e15aef..a805fa8e2 100644
--- a/lib/libvmod_blob/vmod_blob.c
+++ b/lib/libvmod_blob/vmod_blob.c
@@ -33,7 +33,7 @@

#include "cache/cache.h"

-#include "vcc_if.h"
+#include "vcc_blob_if.h"
#include "vmod_blob.h"

#define VMOD_BLOB_TYPE 0xfade4faa
diff --git a/lib/libvmod_blob/vmod.vcc b/lib/libvmod_blob/vmod_blob.vcc
similarity index 100%
rename from lib/libvmod_blob/vmod.vcc
rename to lib/libvmod_blob/vmod_blob.vcc
diff --git a/lib/libvmod_cookie/automake_boilerplate.am b/lib/libvmod_cookie/automake_boilerplate.am
index f5333060a..c3b52f37b 100644
--- a/lib/libvmod_cookie/automake_boilerplate.am
+++ b/lib/libvmod_cookie/automake_boilerplate.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include

vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_if
+vmodtoolargs ?= --strict --boilerplate -o vcc_cookie_if

vmod_LTLIBRARIES = libvmod_cookie.la

@@ -21,18 +21,18 @@ libvmod_cookie_la_LDFLAGS = \
$(VMOD_LDFLAGS) \
@SAN_LDFLAGS@

-nodist_libvmod_cookie_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_cookie_la_SOURCES = vcc_cookie_if.c vcc_cookie_if.h

-$(libvmod_cookie_la_OBJECTS): vcc_if.h
+$(libvmod_cookie_la_OBJECTS): vcc_cookie_if.h

-vcc_if.h vmod_cookie.rst vmod_cookie.man.rst: vcc_if.c
+vcc_cookie_if.h vmod_cookie.rst vmod_cookie.man.rst: vcc_cookie_if.c

-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+vcc_cookie_if.c: $(vmodtool) $(srcdir)/vmod_cookie.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_cookie.vcc

-EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_cookie.vcc automake_boilerplate.am

-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+CLEANFILES = $(builddir)/vcc_cookie_if.c $(builddir)/vcc_cookie_if.h \
$(builddir)/vmod_cookie.rst \
$(builddir)/vmod_cookie.man.rst

@@ -57,7 +57,7 @@ TESTS = \
EXTRA_DIST += $(TESTS)

vtc-refresh-tests:
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_cookie.vcc
@cd $(top_builddir) && ./config.status --file=$(subdir)/Makefile

include $(top_srcdir)/vtc.am
diff --git a/lib/libvmod_cookie/vmod_cookie.c b/lib/libvmod_cookie/vmod_cookie.c
index 87a963e33..5be9178e6 100644
--- a/lib/libvmod_cookie/vmod_cookie.c
+++ b/lib/libvmod_cookie/vmod_cookie.c
@@ -44,7 +44,7 @@
#include <vsb.h>
#include <vre.h>

-#include "vcc_if.h"
+#include "vcc_cookie_if.h"

#define VRE_MAX_GROUPS 8

diff --git a/lib/libvmod_cookie/vmod.vcc b/lib/libvmod_cookie/vmod_cookie.vcc
similarity index 100%
rename from lib/libvmod_cookie/vmod.vcc
rename to lib/libvmod_cookie/vmod_cookie.vcc
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index 8c6df5232..3f902065c 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -17,7 +17,7 @@ libvmod_debug_la_LDFLAGS = \


# not --strict
-vmodtoolargs = --boilerplate
+vmodtoolargs = --boilerplate -o vcc_debug_if

.vsc.c:
$(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $<
diff --git a/lib/libvmod_debug/automake_boilerplate.am b/lib/libvmod_debug/automake_boilerplate.am
index f404971ef..fe41b579d 100644
--- a/lib/libvmod_debug/automake_boilerplate.am
+++ b/lib/libvmod_debug/automake_boilerplate.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include

vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_if
+vmodtoolargs ?= --strict --boilerplate -o vcc_debug_if

vmod_LTLIBRARIES = libvmod_debug.la

@@ -21,17 +21,17 @@ libvmod_debug_la_LDFLAGS = \
$(VMOD_LDFLAGS) \
@SAN_LDFLAGS@

-nodist_libvmod_debug_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_debug_la_SOURCES = vcc_debug_if.c vcc_debug_if.h

-$(libvmod_debug_la_OBJECTS): vcc_if.h
+$(libvmod_debug_la_OBJECTS): vcc_debug_if.h

-vcc_if.h vmod_debug.rst vmod_debug.man.rst: vcc_if.c
+vcc_debug_if.h vmod_debug.rst vmod_debug.man.rst: vcc_debug_if.c

-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+vcc_debug_if.c: $(vmodtool) $(srcdir)/vmod_debug.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_debug.vcc

-EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_debug.vcc automake_boilerplate.am

-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+CLEANFILES = $(builddir)/vcc_debug_if.c $(builddir)/vcc_debug_if.h \
$(builddir)/vmod_debug.rst \
$(builddir)/vmod_debug.man.rst
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index aa54dfeb8..4dbc5ab3b 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -42,7 +42,7 @@
#include "vre.h"
#include "vsa.h"
#include "vtim.h"
-#include "vcc_if.h"
+#include "vcc_debug_if.h"
#include "VSC_debug.h"

struct priv_vcl {
diff --git a/lib/libvmod_debug/vmod.vcc b/lib/libvmod_debug/vmod_debug.vcc
similarity index 100%
rename from lib/libvmod_debug/vmod.vcc
rename to lib/libvmod_debug/vmod_debug.vcc
diff --git a/lib/libvmod_debug/vmod_debug_dyn.c b/lib/libvmod_debug/vmod_debug_dyn.c
index b2430a978..3ef74544c 100644
--- a/lib/libvmod_debug/vmod_debug_dyn.c
+++ b/lib/libvmod_debug/vmod_debug_dyn.c
@@ -41,7 +41,7 @@

#include "vsa.h"
#include "vss.h"
-#include "vcc_if.h"
+#include "vcc_debug_if.h"

struct xyzzy_debug_dyn {
unsigned magic;
diff --git a/lib/libvmod_debug/vmod_debug_obj.c b/lib/libvmod_debug/vmod_debug_obj.c
index 0d32683b1..8efd6ad50 100644
--- a/lib/libvmod_debug/vmod_debug_obj.c
+++ b/lib/libvmod_debug/vmod_debug_obj.c
@@ -35,7 +35,7 @@

#include "cache/cache.h"

-#include "vcc_if.h"
+#include "vcc_debug_if.h"

struct xyzzy_debug_obj {
unsigned magic;
diff --git a/lib/libvmod_directors/automake_boilerplate.am b/lib/libvmod_directors/automake_boilerplate.am
index 69287d3d6..c03bd61d8 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include

vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_if
+vmodtoolargs ?= --strict --boilerplate -o vcc_directors_if

vmod_LTLIBRARIES = libvmod_directors.la

@@ -21,17 +21,17 @@ libvmod_directors_la_LDFLAGS = \
$(VMOD_LDFLAGS) \
@SAN_LDFLAGS@

-nodist_libvmod_directors_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_directors_la_SOURCES = vcc_directors_if.c vcc_directors_if.h

-$(libvmod_directors_la_OBJECTS): vcc_if.h
+$(libvmod_directors_la_OBJECTS): vcc_directors_if.h

-vcc_if.h vmod_directors.rst vmod_directors.man.rst: vcc_if.c
+vcc_directors_if.h vmod_directors.rst vmod_directors.man.rst: vcc_directors_if.c

-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+vcc_directors_if.c: $(vmodtool) $(srcdir)/vmod_directors.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_directors.vcc

-EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_directors.vcc automake_boilerplate.am

-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+CLEANFILES = $(builddir)/vcc_directors_if.c $(builddir)/vcc_directors_if.h \
$(builddir)/vmod_directors.rst \
$(builddir)/vmod_directors.man.rst
diff --git a/lib/libvmod_directors/fall_back.c b/lib/libvmod_directors/fall_back.c
index 72001d6de..425c1093a 100644
--- a/lib/libvmod_directors/fall_back.c
+++ b/lib/libvmod_directors/fall_back.c
@@ -35,7 +35,7 @@

#include "cache/cache.h"

-#include "vcc_if.h"
+#include "vcc_directors_if.h"

#include "vdir.h"
#include "vsb.h"
diff --git a/lib/libvmod_directors/hash.c b/lib/libvmod_directors/hash.c
index 314e9a2c6..eeddffca2 100644
--- a/lib/libvmod_directors/hash.c
+++ b/lib/libvmod_directors/hash.c
@@ -37,7 +37,7 @@

#include "vdir.h"

-#include "vcc_if.h"
+#include "vcc_directors_if.h"

struct vmod_directors_hash {
unsigned magic;
diff --git a/lib/libvmod_directors/misc.c b/lib/libvmod_directors/misc.c
index d70c8ce55..f43875d61 100644
--- a/lib/libvmod_directors/misc.c
+++ b/lib/libvmod_directors/misc.c
@@ -34,7 +34,7 @@
#include "vrt.h"
#include "vcl.h"

-#include "vcc_if.h"
+#include "vcc_directors_if.h"

VCL_BACKEND
VPFX(lookup)(VRT_CTX, VCL_STRING name)
diff --git a/lib/libvmod_directors/random.c b/lib/libvmod_directors/random.c
index fc0e355c8..b18e1f6fd 100644
--- a/lib/libvmod_directors/random.c
+++ b/lib/libvmod_directors/random.c
@@ -39,7 +39,7 @@

#include "vdir.h"

-#include "vcc_if.h"
+#include "vcc_directors_if.h"

struct vmod_directors_random {
unsigned magic;
diff --git a/lib/libvmod_directors/round_robin.c b/lib/libvmod_directors/round_robin.c
index bc4e81876..74ec567e0 100644
--- a/lib/libvmod_directors/round_robin.c
+++ b/lib/libvmod_directors/round_robin.c
@@ -35,7 +35,7 @@

#include "cache/cache.h"

-#include "vcc_if.h"
+#include "vcc_directors_if.h"

#include "vdir.h"

diff --git a/lib/libvmod_directors/shard_dir.c b/lib/libvmod_directors/shard_dir.c
index ea3dafad3..809fd67a5 100644
--- a/lib/libvmod_directors/shard_dir.c
+++ b/lib/libvmod_directors/shard_dir.c
@@ -44,7 +44,7 @@
#include "vbm.h"
#include "vrnd.h"

-#include "vcc_if.h"
+#include "vcc_directors_if.h"
#include "shard_dir.h"

struct shard_be_info {
diff --git a/lib/libvmod_directors/vmod.vcc b/lib/libvmod_directors/vmod_directors.vcc
similarity index 100%
rename from lib/libvmod_directors/vmod.vcc
rename to lib/libvmod_directors/vmod_directors.vcc
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index d634f0785..9779ae78d 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -39,7 +39,7 @@

#include "vend.h"

-#include "vcc_if.h"
+#include "vcc_directors_if.h"
#include "shard_dir.h"
#include "shard_cfg.h"
#include "vsb.h"
diff --git a/lib/libvmod_proxy/automake_boilerplate.am b/lib/libvmod_proxy/automake_boilerplate.am
index fb295e30c..c4a099974 100644
--- a/lib/libvmod_proxy/automake_boilerplate.am
+++ b/lib/libvmod_proxy/automake_boilerplate.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include

vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_if
+vmodtoolargs ?= --strict --boilerplate -o vcc_proxy_if

vmod_LTLIBRARIES = libvmod_proxy.la

@@ -21,17 +21,17 @@ libvmod_proxy_la_LDFLAGS = \
$(VMOD_LDFLAGS) \
@SAN_LDFLAGS@

-nodist_libvmod_proxy_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_proxy_la_SOURCES = vcc_proxy_if.c vcc_proxy_if.h

-$(libvmod_proxy_la_OBJECTS): vcc_if.h
+$(libvmod_proxy_la_OBJECTS): vcc_proxy_if.h

-vcc_if.h vmod_proxy.rst vmod_proxy.man.rst: vcc_if.c
+vcc_proxy_if.h vmod_proxy.rst vmod_proxy.man.rst: vcc_proxy_if.c

-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+vcc_proxy_if.c: $(vmodtool) $(srcdir)/vmod_proxy.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_proxy.vcc

-EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_proxy.vcc automake_boilerplate.am

-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+CLEANFILES = $(builddir)/vcc_proxy_if.c $(builddir)/vcc_proxy_if.h \
$(builddir)/vmod_proxy.rst \
$(builddir)/vmod_proxy.man.rst
diff --git a/lib/libvmod_proxy/vmod_proxy.c b/lib/libvmod_proxy/vmod_proxy.c
index 499cf24d3..b877d5bc1 100644
--- a/lib/libvmod_proxy/vmod_proxy.c
+++ b/lib/libvmod_proxy/vmod_proxy.c
@@ -40,7 +40,7 @@

#include "proxy/cache_proxy.h"

-#include "vcc_if.h"
+#include "vcc_proxy_if.h"


struct pp2_tlv_ssl {
diff --git a/lib/libvmod_proxy/vmod.vcc b/lib/libvmod_proxy/vmod_proxy.vcc
similarity index 100%
rename from lib/libvmod_proxy/vmod.vcc
rename to lib/libvmod_proxy/vmod_proxy.vcc
diff --git a/lib/libvmod_purge/automake_boilerplate.am b/lib/libvmod_purge/automake_boilerplate.am
index d6d552864..33e9be06c 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include

vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_if
+vmodtoolargs ?= --strict --boilerplate -o vcc_purge_if

vmod_LTLIBRARIES = libvmod_purge.la

@@ -21,17 +21,17 @@ libvmod_purge_la_LDFLAGS = \
$(VMOD_LDFLAGS) \
@SAN_LDFLAGS@

-nodist_libvmod_purge_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_purge_la_SOURCES = vcc_purge_if.c vcc_purge_if.h

-$(libvmod_purge_la_OBJECTS): vcc_if.h
+$(libvmod_purge_la_OBJECTS): vcc_purge_if.h

-vcc_if.h vmod_purge.rst vmod_purge.man.rst: vcc_if.c
+vcc_purge_if.h vmod_purge.rst vmod_purge.man.rst: vcc_purge_if.c

-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+vcc_purge_if.c: $(vmodtool) $(srcdir)/vmod_purge.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_purge.vcc

-EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_purge.vcc automake_boilerplate.am

-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+CLEANFILES = $(builddir)/vcc_purge_if.c $(builddir)/vcc_purge_if.h \
$(builddir)/vmod_purge.rst \
$(builddir)/vmod_purge.man.rst
diff --git a/lib/libvmod_purge/vmod_purge.c b/lib/libvmod_purge/vmod_purge.c
index fd68b31e4..594895d42 100644
--- a/lib/libvmod_purge/vmod_purge.c
+++ b/lib/libvmod_purge/vmod_purge.c
@@ -38,7 +38,7 @@
#include "miniobj.h"
#include "vrt.h"

-#include "vcc_if.h"
+#include "vcc_purge_if.h"

VCL_INT v_matchproto_(td_purge_hard)
vmod_hard(VRT_CTX)
diff --git a/lib/libvmod_purge/vmod.vcc b/lib/libvmod_purge/vmod_purge.vcc
similarity index 100%
rename from lib/libvmod_purge/vmod.vcc
rename to lib/libvmod_purge/vmod_purge.vcc
diff --git a/lib/libvmod_std/automake_boilerplate.am b/lib/libvmod_std/automake_boilerplate.am
index 146a4f1a6..3e84940b8 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include

vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_if
+vmodtoolargs ?= --strict --boilerplate -o vcc_std_if

vmod_LTLIBRARIES = libvmod_std.la

@@ -21,18 +21,18 @@ libvmod_std_la_LDFLAGS = \
$(VMOD_LDFLAGS) \
@SAN_LDFLAGS@

-nodist_libvmod_std_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_std_la_SOURCES = vcc_std_if.c vcc_std_if.h

-$(libvmod_std_la_OBJECTS): vcc_if.h
+$(libvmod_std_la_OBJECTS): vcc_std_if.h

-vcc_if.h vmod_std.rst vmod_std.man.rst: vcc_if.c
+vcc_std_if.h vmod_std.rst vmod_std.man.rst: vcc_std_if.c

-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+vcc_std_if.c: $(vmodtool) $(srcdir)/vmod_std.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_std.vcc

-EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_std.vcc automake_boilerplate.am

-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+CLEANFILES = $(builddir)/vcc_std_if.c $(builddir)/vcc_std_if.h \
$(builddir)/vmod_std.rst \
$(builddir)/vmod_std.man.rst

@@ -42,7 +42,7 @@ TESTS = \
EXTRA_DIST += $(TESTS)

vtc-refresh-tests:
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_std.vcc
@cd $(top_builddir) && ./config.status --file=$(subdir)/Makefile

include $(top_srcdir)/vtc.am
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index 51a9b7e16..244680bfb 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -49,7 +49,7 @@
#include "vtim.h"
#include "vcl.h"

-#include "vcc_if.h"
+#include "vcc_std_if.h"

VCL_VOID v_matchproto_(td_std_set_ip_tos)
vmod_set_ip_tos(VRT_CTX, VCL_INT tos)
diff --git a/lib/libvmod_std/vmod.vcc b/lib/libvmod_std/vmod_std.vcc
similarity index 100%
rename from lib/libvmod_std/vmod.vcc
rename to lib/libvmod_std/vmod_std.vcc
diff --git a/lib/libvmod_std/vmod_std_conversions.c b/lib/libvmod_std/vmod_std_conversions.c
index e038d785a..3f0b74ea1 100644
--- a/lib/libvmod_std/vmod_std_conversions.c
+++ b/lib/libvmod_std/vmod_std_conversions.c
@@ -44,7 +44,7 @@
#include "vsa.h"
#include "vss.h"
#include "vtim.h"
-#include "vcc_if.h"
+#include "vcc_std_if.h"

/*
* technically, as our VCL_INT is int64_t, its limits are INT64_MIN/INT64_MAX.
diff --git a/lib/libvmod_std/vmod_std_fileread.c b/lib/libvmod_std/vmod_std_fileread.c
index cd9181e2b..0e9f5cadc 100644
--- a/lib/libvmod_std/vmod_std_fileread.c
+++ b/lib/libvmod_std/vmod_std_fileread.c
@@ -48,7 +48,7 @@

#include "vfil.h"

-#include "vcc_if.h"
+#include "vcc_std_if.h"

struct frfile {
unsigned magic;
diff --git a/lib/libvmod_std/vmod_std_querysort.c b/lib/libvmod_std/vmod_std_querysort.c
index f5b5e115e..8602dc6e1 100644
--- a/lib/libvmod_std/vmod_std_querysort.c
+++ b/lib/libvmod_std/vmod_std_querysort.c
@@ -35,7 +35,7 @@

#include "cache/cache.h"

-#include "vcc_if.h"
+#include "vcc_std_if.h"

static int
compa(const void *a, const void *b)
diff --git a/lib/libvmod_unix/automake_boilerplate.am b/lib/libvmod_unix/automake_boilerplate.am
index 6eaa08742..913bc01c5 100644
--- a/lib/libvmod_unix/automake_boilerplate.am
+++ b/lib/libvmod_unix/automake_boilerplate.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include

vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_if
+vmodtoolargs ?= --strict --boilerplate -o vcc_unix_if

vmod_LTLIBRARIES = libvmod_unix.la

@@ -21,17 +21,17 @@ libvmod_unix_la_LDFLAGS = \
$(VMOD_LDFLAGS) \
@SAN_LDFLAGS@

-nodist_libvmod_unix_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_unix_la_SOURCES = vcc_unix_if.c vcc_unix_if.h

-$(libvmod_unix_la_OBJECTS): vcc_if.h
+$(libvmod_unix_la_OBJECTS): vcc_unix_if.h

-vcc_if.h vmod_unix.rst vmod_unix.man.rst: vcc_if.c
+vcc_unix_if.h vmod_unix.rst vmod_unix.man.rst: vcc_unix_if.c

-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+vcc_unix_if.c: $(vmodtool) $(srcdir)/vmod_unix.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_unix.vcc

-EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_unix.vcc automake_boilerplate.am

-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+CLEANFILES = $(builddir)/vcc_unix_if.c $(builddir)/vcc_unix_if.h \
$(builddir)/vmod_unix.rst \
$(builddir)/vmod_unix.man.rst
diff --git a/lib/libvmod_unix/vmod_unix.c b/lib/libvmod_unix/vmod_unix.c
index 99159a182..d7b882693 100644
--- a/lib/libvmod_unix/vmod_unix.c
+++ b/lib/libvmod_unix/vmod_unix.c
@@ -38,7 +38,7 @@
#include "common/heritage.h"

#include "cred_compat.h"
-#include "vcc_if.h"
+#include "vcc_unix_if.h"

#define FAIL(ctx, msg) \
VRT_fail((ctx), "vmod unix failure: " msg)
diff --git a/lib/libvmod_unix/vmod.vcc b/lib/libvmod_unix/vmod_unix.vcc
similarity index 100%
rename from lib/libvmod_unix/vmod.vcc
rename to lib/libvmod_unix/vmod_unix.vcc
diff --git a/lib/libvmod_vtc/automake_boilerplate.am b/lib/libvmod_vtc/automake_boilerplate.am
index e330e3821..1099900f9 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include

vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_if
+vmodtoolargs ?= --strict --boilerplate -o vcc_vtc_if

vmod_LTLIBRARIES = libvmod_vtc.la

@@ -21,17 +21,17 @@ libvmod_vtc_la_LDFLAGS = \
$(VMOD_LDFLAGS) \
@SAN_LDFLAGS@

-nodist_libvmod_vtc_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_vtc_la_SOURCES = vcc_vtc_if.c vcc_vtc_if.h

-$(libvmod_vtc_la_OBJECTS): vcc_if.h
+$(libvmod_vtc_la_OBJECTS): vcc_vtc_if.h

-vcc_if.h vmod_vtc.rst vmod_vtc.man.rst: vcc_if.c
+vcc_vtc_if.h vmod_vtc.rst vmod_vtc.man.rst: vcc_vtc_if.c

-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
- @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+vcc_vtc_if.c: $(vmodtool) $(srcdir)/vmod_vtc.vcc
+ @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_vtc.vcc

-EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod_vtc.vcc automake_boilerplate.am

-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
+CLEANFILES = $(builddir)/vcc_vtc_if.c $(builddir)/vcc_vtc_if.h \
$(builddir)/vmod_vtc.rst \
$(builddir)/vmod_vtc.man.rst
diff --git a/lib/libvmod_vtc/vmod_vtc.c b/lib/libvmod_vtc/vmod_vtc.c
index 499b611aa..b2b9afd7d 100644
--- a/lib/libvmod_vtc/vmod_vtc.c
+++ b/lib/libvmod_vtc/vmod_vtc.c
@@ -41,7 +41,7 @@
#include "vtcp.h"
#include "vtim.h"

-#include "vcc_if.h"
+#include "vcc_vtc_if.h"

VCL_VOID v_matchproto_(td_vtc_barrier_sync)
vmod_barrier_sync(VRT_CTX, VCL_STRING addr, VCL_DURATION tmo)
diff --git a/lib/libvmod_vtc/vmod.vcc b/lib/libvmod_vtc/vmod_vtc.vcc
similarity index 100%
rename from lib/libvmod_vtc/vmod.vcc
rename to lib/libvmod_vtc/vmod_vtc.vcc
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit

©2024 GT.net. A Gossamer Threads company.
5th Floor, 455 Granville St., Vancouver, BC V6C 1T1, Canada | Legal