[master] 3c64cf396 build: Move all VMODs to $(top_srcdir)/vmod/
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Thu Jan 7 14:16:07 UTC 2021
commit 3c64cf3964ce0d62f201415b7358d211b593895d
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Tue Jan 5 18:29:53 2021 +0100
build: Move all VMODs to $(top_srcdir)/vmod/
This will improve the build parallelism, and will allow us to run the
VMOD test suite after the main one.
diff --git a/.gitignore b/.gitignore
index 0c5a0624e..7dba66a9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,11 +72,11 @@ cscope.*out
/bin/varnishd/VSC_*.h
# 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_*/vmod_*.rst
+/vmod/VSC_*.c
+/vmod/VSC_*.h
+/vmod/vcc_*_if.c
+/vmod/vcc_*_if.h
+/vmod/vmod_*.rst
# Man-files and binaries
/man/*.1
diff --git a/Makefile.am b/Makefile.am
index f0e132389..843b67f09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4 -I .
-SUBDIRS = include lib bin etc doc man
+SUBDIRS = include lib bin vmod etc doc man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = varnishapi.pc
diff --git a/bin/varnishd/flint.sh b/bin/varnishd/flint.sh
index af06e7568..2442255bc 100755
--- a/bin/varnishd/flint.sh
+++ b/bin/varnishd/flint.sh
@@ -19,20 +19,8 @@ FLOPS='
../../lib/libvarnish/*.c
../../lib/libvcc/flint.lnt
../../lib/libvcc/*.c
- ../../lib/libvmod_blob/flint.lnt
- ../../lib/libvmod_blob/*.c
- ../../lib/libvmod_debug/flint.lnt
- ../../lib/libvmod_debug/*.c
- ../../lib/libvmod_directors/flint.lnt
- ../../lib/libvmod_directors/*.c
- ../../lib/libvmod_proxy/flint.lnt
- ../../lib/libvmod_proxy/*.c
- ../../lib/libvmod_purge/flint.lnt
- ../../lib/libvmod_purge/*.c
- ../../lib/libvmod_std/flint.lnt
- ../../lib/libvmod_std/*.c
- ../../lib/libvmod_vtc/flint.lnt
- ../../lib/libvmod_vtc/*.c
+ ../../vmod/flint.lnt
+ ../../vmod/*.c
'
. ../../tools/flint_skel.sh
diff --git a/bin/varnishd/vclflint.sh b/bin/varnishd/vclflint.sh
index c390719d9..742265144 100755
--- a/bin/varnishd/vclflint.sh
+++ b/bin/varnishd/vclflint.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# Run flexelint on the VCL output
-LIBS="-p vmod_path=/home/phk/Varnish/trunk/varnish-cache/lib/libvmod_std/.libs:/home/phk/Varnish/trunk/varnish-cache/lib/libvmod_debug/.libs:/home/phk/Varnish/trunk/varnish-cache/lib/libvmod_directors/.libs:/home/phk/Varnish/trunk/varnish-cache/lib/libvmod_purge/.libs:/home/phk/Varnish/trunk/varnish-cache/lib/libvmod_vtc/.libs:/home/phk/Varnish/trunk/varnish-cache/lib/libvmod_blob/.libs:/home/phk/Varnish/trunk/varnish-cache/lib/libvmod_unix/.libs:/home/phk/Varnish/trunk/varnish-cache/lib/libvmod_proxy/.libs"
+LIBS="-p vmod_path=/home/phk/Varnish/trunk/varnish-cache/vmod/.libs"
if [ "x$1" = "x" ] ; then
./varnishd $LIBS -C -b localhost > /tmp/_.c
diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc
index d6e8b571e..c2b00e45e 100644
--- a/bin/varnishtest/tests/m00003.vtc
+++ b/bin/varnishtest/tests/m00003.vtc
@@ -9,11 +9,11 @@ server s1 {
shell {
echo "vcl 4.1; import std; backend dummy None;" >${tmpdir}/test.vcl
- varnishd -pvmod_path=${topbuild}/lib/libvmod_std/.libs \
+ varnishd -pvmod_path=${topbuild}/vmod/.libs \
-C -f ${tmpdir}/test.vcl 2>/dev/null
}
-varnish v1 -arg "-pvmod_path=${topbuild}/lib/libvmod_std/.libs/" -vcl+backend {
+varnish v1 -arg "-pvmod_path=${topbuild}/vmod/.libs/" -vcl+backend {
import std;
} -start
@@ -23,7 +23,7 @@ varnish v1 -errvcl {Could not find VMOD std} {
import std;
}
-varnish v1 -cliok "param.set vmod_path ${topbuild}/lib/libvmod_std/.libs/"
+varnish v1 -cliok "param.set vmod_path ${topbuild}/vmod/.libs/"
varnish v1 -vcl+backend {
import std;
@@ -38,7 +38,7 @@ varnish v1 -errvcl {Could not open VMOD wrong} {
}
shell {
- cp ${topbuild}/lib/libvmod_debug/.libs/libvmod_debug.so \
+ cp ${topbuild}/vmod/.libs/libvmod_debug.so \
${tmpdir}/libvmod_wrong.so
}
diff --git a/bin/varnishtest/tests/m00008.vtc b/bin/varnishtest/tests/m00008.vtc
index 77b327370..bb0568cd1 100644
--- a/bin/varnishtest/tests/m00008.vtc
+++ b/bin/varnishtest/tests/m00008.vtc
@@ -30,11 +30,11 @@ varnish v1 -cliok "param.set vcc_unsafe_path off"
varnish v1 -errvcl {'import ... from path ...' is unsafe.} {
backend default { .host = "${s1_sock}"; }
- import std from "${topbuild}/lib/libvmod_std/.libs/";
+ import std from "${topbuild}/vmod/.libs/";
}
varnish v1 \
- -cliok "param.set vmod_path /nowhere:${topbuild}/lib/libvmod_std/.libs/"
+ -cliok "param.set vmod_path /nowhere:${topbuild}/vmod/.libs/"
varnish v1 -vcl+backend {
import std;
@@ -45,10 +45,10 @@ varnish v1 -cliok "param.set vcc_unsafe_path on"
varnish v1 -cliok "param.set vmod_path /nowhere:/else"
varnish v1 -vcl+backend {
- import std from "${topbuild}/lib/libvmod_std/.libs/";
+ import std from "${topbuild}/vmod/.libs/";
}
varnish v1 -errvcl {Malformed VMOD std} {
backend default { .host = "${s1_sock}"; }
- import std from "${topbuild}/lib/libvmod_debug/.libs/libvmod_debug.so";
+ import std from "${topbuild}/vmod/.libs/libvmod_debug.so";
}
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 1b322f8de..6110540c2 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -559,7 +559,7 @@ i_mode(void)
*/
VSB_clear(vsb);
- build_path(topbuild, "lib", "libvmod_", "/.libs", vsb);
+ build_path(topbuild, "vmod", ".libs", "", vsb);
AZ(VSB_finish(vsb));
vmod_path = strdup(VSB_data(vsb));
AN(vmod_path);
diff --git a/configure.ac b/configure.ac
index 53ba873d0..5c7c9dd7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -876,17 +876,9 @@ AC_CONFIG_FILES([
lib/libvarnishapi/Makefile
lib/libvcc/Makefile
lib/libvgz/Makefile
- lib/libvmod_cookie/Makefile
- lib/libvmod_debug/Makefile
- lib/libvmod_std/Makefile
- lib/libvmod_directors/Makefile
- lib/libvmod_purge/Makefile
- lib/libvmod_vtc/Makefile
- lib/libvmod_blob/Makefile
- lib/libvmod_unix/Makefile
- lib/libvmod_proxy/Makefile
man/Makefile
varnishapi.pc
varnishapi-uninstalled.pc
+ vmod/Makefile
])
AC_OUTPUT
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 02a691cb9..a85815071 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -174,36 +174,36 @@ BUILT_SOURCES += include/vtc-syntax.rst
# XXX copy/paste rules need some TLC
-include/vmod_std.generated.rst: $(top_builddir)/lib/libvmod_std/vmod_std.rst
- cp $(top_builddir)/lib/libvmod_std/vmod_std.rst $@
+include/vmod_std.generated.rst: $(top_builddir)/vmod/vmod_std.rst
+ cp $(top_builddir)/vmod/vmod_std.rst $@
BUILT_SOURCES += include/vmod_std.generated.rst
-include/vmod_directors.generated.rst: $(top_builddir)/lib/libvmod_directors/vmod_directors.rst
- cp $(top_builddir)/lib/libvmod_directors/vmod_directors.rst $@
+include/vmod_directors.generated.rst: $(top_builddir)/vmod/vmod_directors.rst
+ cp $(top_builddir)/vmod/vmod_directors.rst $@
BUILT_SOURCES += include/vmod_directors.generated.rst
-include/vmod_purge.generated.rst: $(top_builddir)/lib/libvmod_purge/vmod_purge.rst
- cp $(top_builddir)/lib/libvmod_purge/vmod_purge.rst $@
+include/vmod_purge.generated.rst: $(top_builddir)/vmod/vmod_purge.rst
+ cp $(top_builddir)/vmod/vmod_purge.rst $@
BUILT_SOURCES += include/vmod_purge.generated.rst
-include/vmod_vtc.generated.rst: $(top_builddir)/lib/libvmod_vtc/vmod_vtc.rst
- cp $(top_builddir)/lib/libvmod_vtc/vmod_vtc.rst $@
+include/vmod_vtc.generated.rst: $(top_builddir)/vmod/vmod_vtc.rst
+ cp $(top_builddir)/vmod/vmod_vtc.rst $@
BUILT_SOURCES += include/vmod_vtc.generated.rst
-include/vmod_blob.generated.rst: $(top_builddir)/lib/libvmod_blob/vmod_blob.rst
- cp $(top_builddir)/lib/libvmod_blob/vmod_blob.rst $@
+include/vmod_blob.generated.rst: $(top_builddir)/vmod/vmod_blob.rst
+ cp $(top_builddir)/vmod/vmod_blob.rst $@
BUILT_SOURCES += include/vmod_blob.generated.rst
-include/vmod_cookie.generated.rst: $(top_builddir)/lib/libvmod_cookie/vmod_cookie.rst
- cp $(top_builddir)/lib/libvmod_cookie/vmod_cookie.rst $@
+include/vmod_cookie.generated.rst: $(top_builddir)/vmod/vmod_cookie.rst
+ cp $(top_builddir)/vmod/vmod_cookie.rst $@
BUILT_SOURCES += include/vmod_cookie.generated.rst
-include/vmod_unix.generated.rst: $(top_builddir)/lib/libvmod_unix/vmod_unix.rst
- cp $(top_builddir)/lib/libvmod_unix/vmod_unix.rst $@
+include/vmod_unix.generated.rst: $(top_builddir)/vmod/vmod_unix.rst
+ cp $(top_builddir)/vmod/vmod_unix.rst $@
BUILT_SOURCES += include/vmod_unix.generated.rst
-include/vmod_proxy.generated.rst: $(top_builddir)/lib/libvmod_proxy/vmod_proxy.rst
- cp $(top_builddir)/lib/libvmod_proxy/vmod_proxy.rst $@
+include/vmod_proxy.generated.rst: $(top_builddir)/vmod/vmod_proxy.rst
+ cp $(top_builddir)/vmod/vmod_proxy.rst $@
BUILT_SOURCES += include/vmod_proxy.generated.rst
EXTRA_DIST += $(BUILT_SOURCES)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1cd630954..0f6873c50 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,13 +4,4 @@ SUBDIRS = \
libvarnish \
libvarnishapi \
libvcc \
- libvgz \
- libvmod_cookie \
- libvmod_debug \
- libvmod_std \
- libvmod_directors \
- libvmod_purge \
- libvmod_vtc \
- libvmod_blob \
- libvmod_unix \
- libvmod_proxy
+ libvgz
diff --git a/lib/libvmod_blob/Makefile.am b/lib/libvmod_blob/Makefile.am
deleted file mode 100644
index 6015d15ca..000000000
--- a/lib/libvmod_blob/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-
-AM_LDFLAGS = $(AM_LT_LDFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/bin/varnishd \
- -I$(top_builddir)/include
-
-vmod_LTLIBRARIES =
-EXTRA_DIST =
-CLEANFILES =
-
-libvmod_blob_la_SOURCES = \
- vmod_blob.c \
- vmod_blob.h \
- id.c \
- base64.c \
- hex.h \
- hex.c \
- url.c \
- tbl_encodings.h \
- tbl_case.h
-
-# Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate_blob.am
diff --git a/lib/libvmod_blob/flint.lnt b/lib/libvmod_blob/flint.lnt
deleted file mode 100644
index 016a8329d..000000000
--- a/lib/libvmod_blob/flint.lnt
+++ /dev/null
@@ -1,4 +0,0 @@
--efile(451, "tbl_*.h") // No include guard
-
--e784 // Nul character truncated from string
-
diff --git a/lib/libvmod_cookie/Makefile.am b/lib/libvmod_cookie/Makefile.am
deleted file mode 100644
index fe762a186..000000000
--- a/lib/libvmod_cookie/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-AM_LDFLAGS = $(AM_LT_LDFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/bin/varnishd \
- -I$(top_builddir)/include
-
-vmod_LTLIBRARIES =
-EXTRA_DIST =
-CLEANFILES =
-
-libvmod_cookie_la_SOURCES = \
- vmod_cookie.c
-
-# Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate_cookie.am
-
-TESTS = \
- tests/cookie_b00000.vtc \
- tests/cookie_b00001.vtc \
- tests/cookie_b00002.vtc \
- tests/cookie_b00003.vtc \
- tests/cookie_b00004.vtc \
- tests/cookie_b00005.vtc \
- tests/cookie_b00006.vtc \
- tests/cookie_b00007.vtc \
- tests/cookie_b00008.vtc \
- tests/cookie_b00009.vtc \
- tests/cookie_b00010.vtc \
- tests/cookie_b00011.vtc \
- tests/cookie_b00012.vtc \
- tests/cookie_b00013.vtc \
- tests/cookie_r00028.vtc \
- tests/cookie_v00000.vtc
-
-EXTRA_DIST += $(TESTS)
-
-vtc-refresh-tests:
- @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/flint.lnt b/lib/libvmod_cookie/flint.lnt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/libvmod_cookie/flint.sh b/lib/libvmod_cookie/flint.sh
deleted file mode 100755
index 522e30d4d..000000000
--- a/lib/libvmod_cookie/flint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FLOPS='
- -I../../bin/varnishd
- *.c
-'
-
-. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
deleted file mode 100644
index ccb866ba1..000000000
--- a/lib/libvmod_debug/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-
-AM_LDFLAGS = $(AM_LT_LDFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/bin/varnishd \
- -I$(top_builddir)/include
-
-vmod_LTLIBRARIES =
-EXTRA_DIST =
-CLEANFILES =
-
-libvmod_debug_la_SOURCES = \
- vmod_debug.c \
- vmod_debug_obj.c \
- vmod_debug_dyn.c
-
-include $(srcdir)/automake_boilerplate_debug.am
-
-# Allow Vmod_wrong*_Data to be exported
-vmod_debug_symbols_regex = 'Vmod_.*_Data'
-
-# not --strict
-vmodtoolargs_debug = --boilerplate -o vcc_debug_if
-
-.vsc.c:
- $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $<
-
-VSC_SRC = VSC_debug.vsc
-VSC_GEN_C = VSC_debug.c
-VSC_GEN_H = VSC_debug.h
-
-CLEANFILES += $(VSC_GEN_C) $(VSC_GEN_H)
-
-BUILT_SOURCES = $(VSC_GEN_C)
-libvmod_debug_la_SOURCES += $(VSC_SRC)
diff --git a/lib/libvmod_debug/flint.sh b/lib/libvmod_debug/flint.sh
deleted file mode 100755
index 522e30d4d..000000000
--- a/lib/libvmod_debug/flint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FLOPS='
- -I../../bin/varnishd
- *.c
-'
-
-. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_directors/Makefile.am b/lib/libvmod_directors/Makefile.am
deleted file mode 100644
index c461639bc..000000000
--- a/lib/libvmod_directors/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-
-AM_LDFLAGS = $(AM_LT_LDFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/bin/varnishd \
- -I$(top_builddir)/include
-
-vmod_LTLIBRARIES =
-EXTRA_DIST =
-CLEANFILES =
-
-libvmod_directors_la_SOURCES = \
- vdir.c \
- vdir.h \
- fall_back.c \
- hash.c \
- misc.c \
- random.c \
- round_robin.c \
- vmod_shard.c \
- shard_cfg.c \
- shard_cfg.h \
- shard_dir.c \
- shard_dir.h
-
-# Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate_directors.am
diff --git a/lib/libvmod_directors/flint.lnt b/lib/libvmod_directors/flint.lnt
deleted file mode 100644
index 1b6f0888f..000000000
--- a/lib/libvmod_directors/flint.lnt
+++ /dev/null
@@ -1 +0,0 @@
--efile(451, "tbl_*.h") // No include guard
diff --git a/lib/libvmod_directors/flint.sh b/lib/libvmod_directors/flint.sh
deleted file mode 100755
index 522e30d4d..000000000
--- a/lib/libvmod_directors/flint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FLOPS='
- -I../../bin/varnishd
- *.c
-'
-
-. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_proxy/Makefile.am b/lib/libvmod_proxy/Makefile.am
deleted file mode 100644
index c96d8c8d1..000000000
--- a/lib/libvmod_proxy/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-
-AM_LDFLAGS = $(AM_LT_LDFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/bin/varnishd \
- -I$(top_builddir)/include
-
-vmod_LTLIBRARIES =
-EXTRA_DIST =
-CLEANFILES =
-
-libvmod_proxy_la_SOURCES = \
- vmod_proxy.c
-
-# Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate_proxy.am
diff --git a/lib/libvmod_proxy/flint.lnt b/lib/libvmod_proxy/flint.lnt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/libvmod_proxy/flint.sh b/lib/libvmod_proxy/flint.sh
deleted file mode 100755
index 522e30d4d..000000000
--- a/lib/libvmod_proxy/flint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FLOPS='
- -I../../bin/varnishd
- *.c
-'
-
-. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_purge/Makefile.am b/lib/libvmod_purge/Makefile.am
deleted file mode 100644
index 8af2b1475..000000000
--- a/lib/libvmod_purge/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-
-AM_LDFLAGS = $(AM_LT_LDFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/bin/varnishd \
- -I$(top_builddir)/include
-
-vmod_LTLIBRARIES =
-EXTRA_DIST =
-CLEANFILES =
-
-libvmod_purge_la_SOURCES = \
- vmod_purge.c
-
-# Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate_purge.am
diff --git a/lib/libvmod_purge/flint.lnt b/lib/libvmod_purge/flint.lnt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/libvmod_purge/flint.sh b/lib/libvmod_purge/flint.sh
deleted file mode 100755
index 522e30d4d..000000000
--- a/lib/libvmod_purge/flint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FLOPS='
- -I../../bin/varnishd
- *.c
-'
-
-. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_std/Makefile.am b/lib/libvmod_std/Makefile.am
deleted file mode 100644
index bb922ea97..000000000
--- a/lib/libvmod_std/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-
-AM_LDFLAGS = $(AM_LT_LDFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/bin/varnishd \
- -I$(top_builddir)/include
-
-vmod_LTLIBRARIES =
-EXTRA_DIST =
-CLEANFILES =
-
-libvmod_std_la_SOURCES = \
- vmod_std.c \
- vmod_std_conversions.c \
- vmod_std_fileread.c \
- vmod_std_querysort.c
-
-# Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate_std.am
-
-TESTS = \
- tests/std_b00001.vtc
-
-EXTRA_DIST += $(TESTS)
-
-vtc-refresh-tests:
- @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/flint.lnt b/lib/libvmod_std/flint.lnt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/libvmod_std/flint.sh b/lib/libvmod_std/flint.sh
deleted file mode 100755
index 522e30d4d..000000000
--- a/lib/libvmod_std/flint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FLOPS='
- -I../../bin/varnishd
- *.c
-'
-
-. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_unix/Makefile.am b/lib/libvmod_unix/Makefile.am
deleted file mode 100644
index db4a1cec5..000000000
--- a/lib/libvmod_unix/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-
-AM_LDFLAGS = $(AM_LT_LDFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/bin/varnishd \
- -I$(top_builddir)/include
-
-vmod_LTLIBRARIES =
-EXTRA_DIST =
-CLEANFILES =
-
-libvmod_unix_la_SOURCES = \
- vmod_unix.c \
- cred_compat.h
-
-# Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate_unix.am
diff --git a/lib/libvmod_unix/flint.lnt b/lib/libvmod_unix/flint.lnt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/libvmod_unix/flint.sh b/lib/libvmod_unix/flint.sh
deleted file mode 100755
index 522e30d4d..000000000
--- a/lib/libvmod_unix/flint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FLOPS='
- -I../../bin/varnishd
- *.c
-'
-
-. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_vtc/Makefile.am b/lib/libvmod_vtc/Makefile.am
deleted file mode 100644
index 32fb0aaa6..000000000
--- a/lib/libvmod_vtc/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-
-AM_LDFLAGS = $(AM_LT_LDFLAGS)
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/bin/varnishd \
- -I$(top_builddir)/include
-
-vmod_LTLIBRARIES =
-EXTRA_DIST =
-CLEANFILES =
-
-libvmod_vtc_la_SOURCES = \
- vmod_vtc.c
-
-# Use vmodtool.py generated automake boilerplate
-include $(srcdir)/automake_boilerplate_vtc.am
diff --git a/lib/libvmod_vtc/flint.lnt b/lib/libvmod_vtc/flint.lnt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/libvmod_vtc/flint.sh b/lib/libvmod_vtc/flint.sh
deleted file mode 100755
index 522e30d4d..000000000
--- a/lib/libvmod_vtc/flint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FLOPS='
- -I../../bin/varnishd
- *.c
-'
-
-. ../../tools/flint_skel.sh
diff --git a/man/Makefile.am b/man/Makefile.am
index 5c6ebae88..15bf7c9fc 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -100,28 +100,28 @@ varnishhist.1: \
$(top_builddir)/doc/sphinx/include/varnishhist_synopsis.rst
$(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnishhist.rst $@
-vmod_cookie.3: $(top_builddir)/lib/libvmod_cookie/vmod_cookie.man.rst
+vmod_cookie.3: $(top_builddir)/vmod/vmod_cookie.man.rst
$(BUILD_MAN) $? $@
-vmod_directors.3: $(top_builddir)/lib/libvmod_directors/vmod_directors.man.rst
+vmod_directors.3: $(top_builddir)/vmod/vmod_directors.man.rst
$(BUILD_MAN) $? $@
-vmod_purge.3: $(top_builddir)/lib/libvmod_purge/vmod_purge.man.rst
+vmod_purge.3: $(top_builddir)/vmod/vmod_purge.man.rst
$(BUILD_MAN) $? $@
-vmod_std.3: $(top_builddir)/lib/libvmod_std/vmod_std.man.rst
+vmod_std.3: $(top_builddir)/vmod/vmod_std.man.rst
$(BUILD_MAN) $? $@
-vmod_vtc.3: $(top_builddir)/lib/libvmod_vtc/vmod_vtc.man.rst
+vmod_vtc.3: $(top_builddir)/vmod/vmod_vtc.man.rst
$(BUILD_MAN) $? $@
-vmod_blob.3: $(top_builddir)/lib/libvmod_blob/vmod_blob.man.rst
+vmod_blob.3: $(top_builddir)/vmod/vmod_blob.man.rst
$(BUILD_MAN) $? $@
-vmod_unix.3: $(top_builddir)/lib/libvmod_unix/vmod_unix.man.rst
+vmod_unix.3: $(top_builddir)/vmod/vmod_unix.man.rst
$(BUILD_MAN) $? $@
-vmod_proxy.3: $(top_builddir)/lib/libvmod_proxy/vmod_proxy.man.rst
+vmod_proxy.3: $(top_builddir)/vmod/vmod_proxy.man.rst
$(BUILD_MAN) $? $@
.NOPATH: $(dist_man_MANS)
diff --git a/vmod/Makefile.am b/vmod/Makefile.am
new file mode 100644
index 000000000..8241e183d
--- /dev/null
+++ b/vmod/Makefile.am
@@ -0,0 +1,142 @@
+#
+
+AM_LDFLAGS = $(AM_LT_LDFLAGS)
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/bin/varnishd \
+ -I$(top_builddir)/include
+
+#
+# Declare vmod sources
+#
+
+libvmod_blob_la_SOURCES = \
+ vmod_blob.c \
+ vmod_blob.h \
+ id.c \
+ base64.c \
+ hex.h \
+ hex.c \
+ url.c \
+ tbl_encodings.h \
+ tbl_case.h
+
+libvmod_cookie_la_SOURCES = \
+ vmod_cookie.c
+
+.vsc.c:
+ $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -c $<
+
+.vsc.h:
+ $(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -h $<
+
+libvmod_debug_extra_sources = \
+ VSC_debug.vsc
+
+libvmod_debug_built_sources = \
+ VSC_debug.c \
+ VSC_debug.h
+
+libvmod_debug_la_SOURCES = \
+ vmod_debug.c \
+ vmod_debug_obj.c \
+ vmod_debug_dyn.c
+
+libvmod_directors_la_SOURCES = \
+ vdir.c \
+ vdir.h \
+ fall_back.c \
+ hash.c \
+ misc.c \
+ random.c \
+ round_robin.c \
+ vmod_shard.c \
+ shard_cfg.c \
+ shard_cfg.h \
+ shard_dir.c \
+ shard_dir.h
+
+libvmod_proxy_la_SOURCES = \
+ vmod_proxy.c
+
+libvmod_purge_la_SOURCES = \
+ vmod_purge.c
+
+libvmod_std_la_SOURCES = \
+ vmod_std.c \
+ vmod_std_conversions.c \
+ vmod_std_fileread.c \
+ vmod_std_querysort.c
+
+libvmod_unix_la_SOURCES = \
+ vmod_unix.c \
+ cred_compat.h
+
+libvmod_vtc_la_SOURCES = \
+ vmod_vtc.c
+
+#
+# Prepare build variables
+#
+
+vmod_LTLIBRARIES =
+EXTRA_DIST = $(libvmod_debug_extra_sources)
+CLEANFILES = $(libvmod_debug_built_sources)
+BUILT_SOURCES = $(libvmod_debug_built_sources)
+
+#
+# Use vmodtool.py generated automake boilerplate
+#
+
+include $(srcdir)/automake_boilerplate_blob.am
+include $(srcdir)/automake_boilerplate_cookie.am
+include $(srcdir)/automake_boilerplate_debug.am
+include $(srcdir)/automake_boilerplate_directors.am
+include $(srcdir)/automake_boilerplate_proxy.am
+include $(srcdir)/automake_boilerplate_purge.am
+include $(srcdir)/automake_boilerplate_std.am
+include $(srcdir)/automake_boilerplate_unix.am
+include $(srcdir)/automake_boilerplate_vtc.am
+
+#
+# Post-boilerplate tweaks
+#
+
+nodist_libvmod_debug_la_SOURCES += $(libvmod_debug_built_sources)
+
+# Allow Vmod_wrong*_Data to be exported
+vmod_debug_symbols_regex = 'Vmod_.*_Data'
+
+# not --strict
+vmodtoolargs_debug = --boilerplate -o vcc_debug_if
+
+#
+# Manage the vmod test suite
+#
+
+TESTS = \
+ tests/cookie_b00000.vtc \
+ tests/cookie_b00001.vtc \
+ tests/cookie_b00002.vtc \
+ tests/cookie_b00003.vtc \
+ tests/cookie_b00004.vtc \
+ tests/cookie_b00005.vtc \
+ tests/cookie_b00006.vtc \
+ tests/cookie_b00007.vtc \
+ tests/cookie_b00008.vtc \
+ tests/cookie_b00009.vtc \
+ tests/cookie_b00010.vtc \
+ tests/cookie_b00011.vtc \
+ tests/cookie_b00012.vtc \
+ tests/cookie_b00013.vtc \
+ tests/cookie_r00028.vtc \
+ tests/cookie_v00000.vtc \
+ tests/std_b00001.vtc
+
+EXTRA_DIST += $(TESTS)
+
+vtc-refresh-tests:
+ @cd $(top_builddir) && ./config.status --file=$(subdir)/Makefile
+
+include $(top_srcdir)/vtc.am
diff --git a/lib/libvmod_debug/VSC_debug.vsc b/vmod/VSC_debug.vsc
similarity index 100%
rename from lib/libvmod_debug/VSC_debug.vsc
rename to vmod/VSC_debug.vsc
diff --git a/lib/libvmod_blob/automake_boilerplate_blob.am b/vmod/automake_boilerplate_blob.am
similarity index 100%
rename from lib/libvmod_blob/automake_boilerplate_blob.am
rename to vmod/automake_boilerplate_blob.am
diff --git a/lib/libvmod_cookie/automake_boilerplate_cookie.am b/vmod/automake_boilerplate_cookie.am
similarity index 100%
rename from lib/libvmod_cookie/automake_boilerplate_cookie.am
rename to vmod/automake_boilerplate_cookie.am
diff --git a/lib/libvmod_debug/automake_boilerplate_debug.am b/vmod/automake_boilerplate_debug.am
similarity index 100%
rename from lib/libvmod_debug/automake_boilerplate_debug.am
rename to vmod/automake_boilerplate_debug.am
diff --git a/lib/libvmod_directors/automake_boilerplate_directors.am b/vmod/automake_boilerplate_directors.am
similarity index 100%
rename from lib/libvmod_directors/automake_boilerplate_directors.am
rename to vmod/automake_boilerplate_directors.am
diff --git a/lib/libvmod_proxy/automake_boilerplate_proxy.am b/vmod/automake_boilerplate_proxy.am
similarity index 100%
rename from lib/libvmod_proxy/automake_boilerplate_proxy.am
rename to vmod/automake_boilerplate_proxy.am
diff --git a/lib/libvmod_purge/automake_boilerplate_purge.am b/vmod/automake_boilerplate_purge.am
similarity index 100%
rename from lib/libvmod_purge/automake_boilerplate_purge.am
rename to vmod/automake_boilerplate_purge.am
diff --git a/lib/libvmod_std/automake_boilerplate_std.am b/vmod/automake_boilerplate_std.am
similarity index 100%
rename from lib/libvmod_std/automake_boilerplate_std.am
rename to vmod/automake_boilerplate_std.am
diff --git a/lib/libvmod_unix/automake_boilerplate_unix.am b/vmod/automake_boilerplate_unix.am
similarity index 100%
rename from lib/libvmod_unix/automake_boilerplate_unix.am
rename to vmod/automake_boilerplate_unix.am
diff --git a/lib/libvmod_vtc/automake_boilerplate_vtc.am b/vmod/automake_boilerplate_vtc.am
similarity index 100%
rename from lib/libvmod_vtc/automake_boilerplate_vtc.am
rename to vmod/automake_boilerplate_vtc.am
diff --git a/lib/libvmod_blob/base64.c b/vmod/base64.c
similarity index 100%
rename from lib/libvmod_blob/base64.c
rename to vmod/base64.c
diff --git a/lib/libvmod_unix/cred_compat.h b/vmod/cred_compat.h
similarity index 100%
rename from lib/libvmod_unix/cred_compat.h
rename to vmod/cred_compat.h
diff --git a/lib/libvmod_directors/fall_back.c b/vmod/fall_back.c
similarity index 100%
rename from lib/libvmod_directors/fall_back.c
rename to vmod/fall_back.c
diff --git a/lib/libvmod_debug/flint.lnt b/vmod/flint.lnt
similarity index 69%
rename from lib/libvmod_debug/flint.lnt
rename to vmod/flint.lnt
index 2a43e7057..ac5724d6c 100644
--- a/lib/libvmod_debug/flint.lnt
+++ b/vmod/flint.lnt
@@ -1,3 +1,19 @@
+/*
+ * vmod_{blob,directors}
+ */
+
+-efile(451, "tbl_*.h") // No include guard
+
+/*
+ * vmod_blob
+ */
+
+-e784 // Nul character truncated from string
+
+/*
+ * vmod_debug
+ */
+
-esym(759, xyzzy_enum_*) // header declaration for symbol '___' defined at (___)
-esym(765, xyzzy_enum_*) // external '___' (___) could be made static
diff --git a/lib/libvmod_blob/flint.sh b/vmod/flint.sh
similarity index 100%
rename from lib/libvmod_blob/flint.sh
rename to vmod/flint.sh
diff --git a/lib/libvmod_directors/hash.c b/vmod/hash.c
similarity index 100%
rename from lib/libvmod_directors/hash.c
rename to vmod/hash.c
diff --git a/lib/libvmod_blob/hex.c b/vmod/hex.c
similarity index 100%
rename from lib/libvmod_blob/hex.c
rename to vmod/hex.c
diff --git a/lib/libvmod_blob/hex.h b/vmod/hex.h
similarity index 100%
rename from lib/libvmod_blob/hex.h
rename to vmod/hex.h
diff --git a/lib/libvmod_blob/id.c b/vmod/id.c
similarity index 100%
rename from lib/libvmod_blob/id.c
rename to vmod/id.c
diff --git a/lib/libvmod_directors/misc.c b/vmod/misc.c
similarity index 100%
rename from lib/libvmod_directors/misc.c
rename to vmod/misc.c
diff --git a/lib/libvmod_directors/random.c b/vmod/random.c
similarity index 100%
rename from lib/libvmod_directors/random.c
rename to vmod/random.c
diff --git a/lib/libvmod_directors/round_robin.c b/vmod/round_robin.c
similarity index 100%
rename from lib/libvmod_directors/round_robin.c
rename to vmod/round_robin.c
diff --git a/lib/libvmod_directors/shard_cfg.c b/vmod/shard_cfg.c
similarity index 100%
rename from lib/libvmod_directors/shard_cfg.c
rename to vmod/shard_cfg.c
diff --git a/lib/libvmod_directors/shard_cfg.h b/vmod/shard_cfg.h
similarity index 100%
rename from lib/libvmod_directors/shard_cfg.h
rename to vmod/shard_cfg.h
diff --git a/lib/libvmod_directors/shard_dir.c b/vmod/shard_dir.c
similarity index 100%
rename from lib/libvmod_directors/shard_dir.c
rename to vmod/shard_dir.c
diff --git a/lib/libvmod_directors/shard_dir.h b/vmod/shard_dir.h
similarity index 100%
rename from lib/libvmod_directors/shard_dir.h
rename to vmod/shard_dir.h
diff --git a/lib/libvmod_blob/tbl_case.h b/vmod/tbl_case.h
similarity index 100%
rename from lib/libvmod_blob/tbl_case.h
rename to vmod/tbl_case.h
diff --git a/lib/libvmod_blob/tbl_encodings.h b/vmod/tbl_encodings.h
similarity index 100%
rename from lib/libvmod_blob/tbl_encodings.h
rename to vmod/tbl_encodings.h
diff --git a/lib/libvmod_cookie/tests/cookie_b00000.vtc b/vmod/tests/cookie_b00000.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00000.vtc
rename to vmod/tests/cookie_b00000.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00001.vtc b/vmod/tests/cookie_b00001.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00001.vtc
rename to vmod/tests/cookie_b00001.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00002.vtc b/vmod/tests/cookie_b00002.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00002.vtc
rename to vmod/tests/cookie_b00002.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00003.vtc b/vmod/tests/cookie_b00003.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00003.vtc
rename to vmod/tests/cookie_b00003.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00004.vtc b/vmod/tests/cookie_b00004.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00004.vtc
rename to vmod/tests/cookie_b00004.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00005.vtc b/vmod/tests/cookie_b00005.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00005.vtc
rename to vmod/tests/cookie_b00005.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00006.vtc b/vmod/tests/cookie_b00006.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00006.vtc
rename to vmod/tests/cookie_b00006.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00007.vtc b/vmod/tests/cookie_b00007.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00007.vtc
rename to vmod/tests/cookie_b00007.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00008.vtc b/vmod/tests/cookie_b00008.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00008.vtc
rename to vmod/tests/cookie_b00008.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00009.vtc b/vmod/tests/cookie_b00009.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00009.vtc
rename to vmod/tests/cookie_b00009.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00010.vtc b/vmod/tests/cookie_b00010.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00010.vtc
rename to vmod/tests/cookie_b00010.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00011.vtc b/vmod/tests/cookie_b00011.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00011.vtc
rename to vmod/tests/cookie_b00011.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00012.vtc b/vmod/tests/cookie_b00012.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00012.vtc
rename to vmod/tests/cookie_b00012.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_b00013.vtc b/vmod/tests/cookie_b00013.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_b00013.vtc
rename to vmod/tests/cookie_b00013.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_r00028.vtc b/vmod/tests/cookie_r00028.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_r00028.vtc
rename to vmod/tests/cookie_r00028.vtc
diff --git a/lib/libvmod_cookie/tests/cookie_v00000.vtc b/vmod/tests/cookie_v00000.vtc
similarity index 100%
rename from lib/libvmod_cookie/tests/cookie_v00000.vtc
rename to vmod/tests/cookie_v00000.vtc
diff --git a/lib/libvmod_std/tests/std_b00001.vtc b/vmod/tests/std_b00001.vtc
similarity index 100%
rename from lib/libvmod_std/tests/std_b00001.vtc
rename to vmod/tests/std_b00001.vtc
diff --git a/lib/libvmod_blob/url.c b/vmod/url.c
similarity index 100%
rename from lib/libvmod_blob/url.c
rename to vmod/url.c
diff --git a/lib/libvmod_directors/vdir.c b/vmod/vdir.c
similarity index 100%
rename from lib/libvmod_directors/vdir.c
rename to vmod/vdir.c
diff --git a/lib/libvmod_directors/vdir.h b/vmod/vdir.h
similarity index 100%
rename from lib/libvmod_directors/vdir.h
rename to vmod/vdir.h
diff --git a/lib/libvmod_blob/vmod_blob.c b/vmod/vmod_blob.c
similarity index 100%
rename from lib/libvmod_blob/vmod_blob.c
rename to vmod/vmod_blob.c
diff --git a/lib/libvmod_blob/vmod_blob.h b/vmod/vmod_blob.h
similarity index 100%
rename from lib/libvmod_blob/vmod_blob.h
rename to vmod/vmod_blob.h
diff --git a/lib/libvmod_blob/vmod_blob.vcc b/vmod/vmod_blob.vcc
similarity index 100%
rename from lib/libvmod_blob/vmod_blob.vcc
rename to vmod/vmod_blob.vcc
diff --git a/lib/libvmod_cookie/vmod_cookie.c b/vmod/vmod_cookie.c
similarity index 100%
rename from lib/libvmod_cookie/vmod_cookie.c
rename to vmod/vmod_cookie.c
diff --git a/lib/libvmod_cookie/vmod_cookie.vcc b/vmod/vmod_cookie.vcc
similarity index 100%
rename from lib/libvmod_cookie/vmod_cookie.vcc
rename to vmod/vmod_cookie.vcc
diff --git a/lib/libvmod_debug/vmod_debug.c b/vmod/vmod_debug.c
similarity index 100%
rename from lib/libvmod_debug/vmod_debug.c
rename to vmod/vmod_debug.c
diff --git a/lib/libvmod_debug/vmod_debug.vcc b/vmod/vmod_debug.vcc
similarity index 100%
rename from lib/libvmod_debug/vmod_debug.vcc
rename to vmod/vmod_debug.vcc
diff --git a/lib/libvmod_debug/vmod_debug_dyn.c b/vmod/vmod_debug_dyn.c
similarity index 100%
rename from lib/libvmod_debug/vmod_debug_dyn.c
rename to vmod/vmod_debug_dyn.c
diff --git a/lib/libvmod_debug/vmod_debug_obj.c b/vmod/vmod_debug_obj.c
similarity index 100%
rename from lib/libvmod_debug/vmod_debug_obj.c
rename to vmod/vmod_debug_obj.c
diff --git a/lib/libvmod_directors/vmod_directors.vcc b/vmod/vmod_directors.vcc
similarity index 100%
rename from lib/libvmod_directors/vmod_directors.vcc
rename to vmod/vmod_directors.vcc
diff --git a/lib/libvmod_proxy/vmod_proxy.c b/vmod/vmod_proxy.c
similarity index 100%
rename from lib/libvmod_proxy/vmod_proxy.c
rename to vmod/vmod_proxy.c
diff --git a/lib/libvmod_proxy/vmod_proxy.vcc b/vmod/vmod_proxy.vcc
similarity index 100%
rename from lib/libvmod_proxy/vmod_proxy.vcc
rename to vmod/vmod_proxy.vcc
diff --git a/lib/libvmod_purge/vmod_purge.c b/vmod/vmod_purge.c
similarity index 100%
rename from lib/libvmod_purge/vmod_purge.c
rename to vmod/vmod_purge.c
diff --git a/lib/libvmod_purge/vmod_purge.vcc b/vmod/vmod_purge.vcc
similarity index 100%
rename from lib/libvmod_purge/vmod_purge.vcc
rename to vmod/vmod_purge.vcc
diff --git a/lib/libvmod_directors/vmod_shard.c b/vmod/vmod_shard.c
similarity index 100%
rename from lib/libvmod_directors/vmod_shard.c
rename to vmod/vmod_shard.c
diff --git a/lib/libvmod_std/vmod_std.c b/vmod/vmod_std.c
similarity index 100%
rename from lib/libvmod_std/vmod_std.c
rename to vmod/vmod_std.c
diff --git a/lib/libvmod_std/vmod_std.vcc b/vmod/vmod_std.vcc
similarity index 100%
rename from lib/libvmod_std/vmod_std.vcc
rename to vmod/vmod_std.vcc
diff --git a/lib/libvmod_std/vmod_std_conversions.c b/vmod/vmod_std_conversions.c
similarity index 100%
rename from lib/libvmod_std/vmod_std_conversions.c
rename to vmod/vmod_std_conversions.c
diff --git a/lib/libvmod_std/vmod_std_fileread.c b/vmod/vmod_std_fileread.c
similarity index 100%
rename from lib/libvmod_std/vmod_std_fileread.c
rename to vmod/vmod_std_fileread.c
diff --git a/lib/libvmod_std/vmod_std_querysort.c b/vmod/vmod_std_querysort.c
similarity index 100%
rename from lib/libvmod_std/vmod_std_querysort.c
rename to vmod/vmod_std_querysort.c
diff --git a/lib/libvmod_unix/vmod_unix.c b/vmod/vmod_unix.c
similarity index 100%
rename from lib/libvmod_unix/vmod_unix.c
rename to vmod/vmod_unix.c
diff --git a/lib/libvmod_unix/vmod_unix.vcc b/vmod/vmod_unix.vcc
similarity index 100%
rename from lib/libvmod_unix/vmod_unix.vcc
rename to vmod/vmod_unix.vcc
diff --git a/lib/libvmod_vtc/vmod_vtc.c b/vmod/vmod_vtc.c
similarity index 100%
rename from lib/libvmod_vtc/vmod_vtc.c
rename to vmod/vmod_vtc.c
diff --git a/lib/libvmod_vtc/vmod_vtc.vcc b/vmod/vmod_vtc.vcc
similarity index 100%
rename from lib/libvmod_vtc/vmod_vtc.vcc
rename to vmod/vmod_vtc.vcc
More information about the varnish-commit
mailing list