Skip to content

V
varnish-cache
Commit 1e6e2fc9 authored by Dridi Boukelmoune's avatar Dridi Boukelmoune
Browse files
Options

build: Reintroduce some VMOD boilerplate everywhere 

Anything left that would prevent two VMODs to live in the same $(srcdir)
because it would be defined more than once.
parent 3cb906ae
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 100 deletions
lib/libvcc/vmodtool.py
View file @ 1e6e2fc9
......@@ -51,14 +51,7 @@ import time
AMBOILERPLATE = '''\
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \\
\t-I$(top_srcdir)/include \\
\t-I$(top_srcdir)/bin/varnishd \\
\t-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_XXX.la
vmod_LTLIBRARIES += libvmod_XXX.la
libvmod_XXX_la_CFLAGS = \\
\t@SAN_CFLAGS@
......@@ -81,9 +74,9 @@ PFX.h vmod_XXX.rst vmod_XXX.man.rst: PFX.c
PFX.c: $(vmodtool) $(srcdir)/VCC
\t@PYTHON@ $(vmodtool) $(vmodtoolargs_XXX) $(srcdir)/VCC
EXTRA_DIST = $(srcdir)/VCC automake_boilerplate_XXX.am
EXTRA_DIST += $(srcdir)/VCC automake_boilerplate_XXX.am
CLEANFILES = $(builddir)/PFX.c $(builddir)/PFX.h \\
CLEANFILES += $(builddir)/PFX.c $(builddir)/PFX.h \\
\t$(builddir)/vmod_XXX.rst \\
\t$(builddir)/vmod_XXX.man.rst
'''
......
lib/libvmod_blob/Makefile.am
View file @ 1e6e2fc9
#
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 \
......
lib/libvmod_blob/automake_boilerplate_blob.am
View file @ 1e6e2fc9
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_blob.la
vmod_LTLIBRARIES += libvmod_blob.la
libvmod_blob_la_CFLAGS = \
@SAN_CFLAGS@
......@@ -30,8 +23,8 @@ 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_blob) $(srcdir)/vmod_blob.vcc
EXTRA_DIST = $(srcdir)/vmod_blob.vcc automake_boilerplate_blob.am
EXTRA_DIST += $(srcdir)/vmod_blob.vcc automake_boilerplate_blob.am
CLEANFILES = $(builddir)/vcc_blob_if.c $(builddir)/vcc_blob_if.h \
CLEANFILES += $(builddir)/vcc_blob_if.c $(builddir)/vcc_blob_if.h \
$(builddir)/vmod_blob.rst \
$(builddir)/vmod_blob.man.rst
lib/libvmod_cookie/Makefile.am
View file @ 1e6e2fc9
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
......
lib/libvmod_cookie/automake_boilerplate_cookie.am
View file @ 1e6e2fc9
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_cookie.la
vmod_LTLIBRARIES += libvmod_cookie.la
libvmod_cookie_la_CFLAGS = \
@SAN_CFLAGS@
......@@ -30,8 +23,8 @@ 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_cookie) $(srcdir)/vmod_cookie.vcc
EXTRA_DIST = $(srcdir)/vmod_cookie.vcc automake_boilerplate_cookie.am
EXTRA_DIST += $(srcdir)/vmod_cookie.vcc automake_boilerplate_cookie.am
CLEANFILES = $(builddir)/vcc_cookie_if.c $(builddir)/vcc_cookie_if.h \
CLEANFILES += $(builddir)/vcc_cookie_if.c $(builddir)/vcc_cookie_if.h \
$(builddir)/vmod_cookie.rst \
$(builddir)/vmod_cookie.man.rst
lib/libvmod_debug/Makefile.am
View file @ 1e6e2fc9
#
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 \
......
lib/libvmod_debug/automake_boilerplate_debug.am
View file @ 1e6e2fc9
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_debug.la
vmod_LTLIBRARIES += libvmod_debug.la
libvmod_debug_la_CFLAGS = \
@SAN_CFLAGS@
......@@ -30,8 +23,8 @@ 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_debug) $(srcdir)/vmod_debug.vcc
EXTRA_DIST = $(srcdir)/vmod_debug.vcc automake_boilerplate_debug.am
EXTRA_DIST += $(srcdir)/vmod_debug.vcc automake_boilerplate_debug.am
CLEANFILES = $(builddir)/vcc_debug_if.c $(builddir)/vcc_debug_if.h \
CLEANFILES += $(builddir)/vcc_debug_if.c $(builddir)/vcc_debug_if.h \
$(builddir)/vmod_debug.rst \
$(builddir)/vmod_debug.man.rst
lib/libvmod_directors/Makefile.am
View file @ 1e6e2fc9
#
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 \
......
lib/libvmod_directors/automake_boilerplate_directors.am
View file @ 1e6e2fc9
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_directors.la
vmod_LTLIBRARIES += libvmod_directors.la
libvmod_directors_la_CFLAGS = \
@SAN_CFLAGS@
......@@ -30,8 +23,8 @@ 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_directors) $(srcdir)/vmod_directors.vcc
EXTRA_DIST = $(srcdir)/vmod_directors.vcc automake_boilerplate_directors.am
EXTRA_DIST += $(srcdir)/vmod_directors.vcc automake_boilerplate_directors.am
CLEANFILES = $(builddir)/vcc_directors_if.c $(builddir)/vcc_directors_if.h \
CLEANFILES += $(builddir)/vcc_directors_if.c $(builddir)/vcc_directors_if.h \
$(builddir)/vmod_directors.rst \
$(builddir)/vmod_directors.man.rst
lib/libvmod_proxy/Makefile.am
View file @ 1e6e2fc9
#
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
......
lib/libvmod_proxy/automake_boilerplate_proxy.am
View file @ 1e6e2fc9
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_proxy.la
vmod_LTLIBRARIES += libvmod_proxy.la
libvmod_proxy_la_CFLAGS = \
@SAN_CFLAGS@
......@@ -30,8 +23,8 @@ 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_proxy) $(srcdir)/vmod_proxy.vcc
EXTRA_DIST = $(srcdir)/vmod_proxy.vcc automake_boilerplate_proxy.am
EXTRA_DIST += $(srcdir)/vmod_proxy.vcc automake_boilerplate_proxy.am
CLEANFILES = $(builddir)/vcc_proxy_if.c $(builddir)/vcc_proxy_if.h \
CLEANFILES += $(builddir)/vcc_proxy_if.c $(builddir)/vcc_proxy_if.h \
$(builddir)/vmod_proxy.rst \
$(builddir)/vmod_proxy.man.rst
lib/libvmod_purge/Makefile.am
View file @ 1e6e2fc9
#
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
......
lib/libvmod_purge/automake_boilerplate_purge.am
View file @ 1e6e2fc9
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_purge.la
vmod_LTLIBRARIES += libvmod_purge.la
libvmod_purge_la_CFLAGS = \
@SAN_CFLAGS@
......@@ -30,8 +23,8 @@ 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_purge) $(srcdir)/vmod_purge.vcc
EXTRA_DIST = $(srcdir)/vmod_purge.vcc automake_boilerplate_purge.am
EXTRA_DIST += $(srcdir)/vmod_purge.vcc automake_boilerplate_purge.am
CLEANFILES = $(builddir)/vcc_purge_if.c $(builddir)/vcc_purge_if.h \
CLEANFILES += $(builddir)/vcc_purge_if.c $(builddir)/vcc_purge_if.h \
$(builddir)/vmod_purge.rst \
$(builddir)/vmod_purge.man.rst
lib/libvmod_std/Makefile.am
View file @ 1e6e2fc9
#
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 \
......
lib/libvmod_std/automake_boilerplate_std.am
View file @ 1e6e2fc9
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_std.la
vmod_LTLIBRARIES += libvmod_std.la
libvmod_std_la_CFLAGS = \
@SAN_CFLAGS@
......@@ -30,8 +23,8 @@ 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_std) $(srcdir)/vmod_std.vcc
EXTRA_DIST = $(srcdir)/vmod_std.vcc automake_boilerplate_std.am
EXTRA_DIST += $(srcdir)/vmod_std.vcc automake_boilerplate_std.am
CLEANFILES = $(builddir)/vcc_std_if.c $(builddir)/vcc_std_if.h \
CLEANFILES += $(builddir)/vcc_std_if.c $(builddir)/vcc_std_if.h \
$(builddir)/vmod_std.rst \
$(builddir)/vmod_std.man.rst
lib/libvmod_unix/Makefile.am
View file @ 1e6e2fc9
#
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
......
lib/libvmod_unix/automake_boilerplate_unix.am
View file @ 1e6e2fc9
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_unix.la
vmod_LTLIBRARIES += libvmod_unix.la
libvmod_unix_la_CFLAGS = \
@SAN_CFLAGS@
......@@ -30,8 +23,8 @@ 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_unix) $(srcdir)/vmod_unix.vcc
EXTRA_DIST = $(srcdir)/vmod_unix.vcc automake_boilerplate_unix.am
EXTRA_DIST += $(srcdir)/vmod_unix.vcc automake_boilerplate_unix.am
CLEANFILES = $(builddir)/vcc_unix_if.c $(builddir)/vcc_unix_if.h \
CLEANFILES += $(builddir)/vcc_unix_if.c $(builddir)/vcc_unix_if.h \
$(builddir)/vmod_unix.rst \
$(builddir)/vmod_unix.man.rst
lib/libvmod_vtc/Makefile.am
View file @ 1e6e2fc9
#
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
......
lib/libvmod_vtc/automake_boilerplate_vtc.am
View file @ 1e6e2fc9
# Generated by vmodtool.py --boilerplate.
AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include
vmod_LTLIBRARIES = libvmod_vtc.la
vmod_LTLIBRARIES += libvmod_vtc.la
libvmod_vtc_la_CFLAGS = \
@SAN_CFLAGS@
......@@ -30,8 +23,8 @@ 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_vtc) $(srcdir)/vmod_vtc.vcc
EXTRA_DIST = $(srcdir)/vmod_vtc.vcc automake_boilerplate_vtc.am
EXTRA_DIST += $(srcdir)/vmod_vtc.vcc automake_boilerplate_vtc.am
CLEANFILES = $(builddir)/vcc_vtc_if.c $(builddir)/vcc_vtc_if.h \
CLEANFILES += $(builddir)/vcc_vtc_if.c $(builddir)/vcc_vtc_if.h \
$(builddir)/vmod_vtc.rst \
$(builddir)/vmod_vtc.man.rst
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