Commit 4a3e805f authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

Define $(vmoddir) in a single location

Trimming more of the automake_boilerplate.am fat that prevents using
$(vmodtool) --boilerplate out of tree.
parent 0c38fc1c
...@@ -163,7 +163,7 @@ varnishd_CFLAGS = \ ...@@ -163,7 +163,7 @@ varnishd_CFLAGS = \
@SAN_CFLAGS@ \ @SAN_CFLAGS@ \
-DNOT_IN_A_VMOD \ -DNOT_IN_A_VMOD \
-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \ -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
-DVARNISH_VMOD_DIR='"${pkglibdir}/vmods"' \ -DVARNISH_VMOD_DIR='"${vmoddir}"' \
-DVARNISH_VCL_DIR='"${pkgsysconfdir}:${vcldir}"' -DVARNISH_VCL_DIR='"${pkgsysconfdir}:${vcldir}"'
varnishd_LDFLAGS = -export-dynamic varnishd_LDFLAGS = -export-dynamic
......
...@@ -665,6 +665,9 @@ AC_SUBST(VARNISH_STATE_DIR) ...@@ -665,6 +665,9 @@ AC_SUBST(VARNISH_STATE_DIR)
pkgsysconfdir='${sysconfdir}/varnish' pkgsysconfdir='${sysconfdir}/varnish'
AC_SUBST(pkgsysconfdir) AC_SUBST(pkgsysconfdir)
# VMODs directory
AC_SUBST(vmoddir, [$\(pkglibdir\)/vmods])
# Check for linker script support # Check for linker script support
gl_LD_VERSION_SCRIPT gl_LD_VERSION_SCRIPT
......
...@@ -56,7 +56,6 @@ AM_CPPFLAGS = \\ ...@@ -56,7 +56,6 @@ AM_CPPFLAGS = \\
\t-I$(top_srcdir)/bin/varnishd \\ \t-I$(top_srcdir)/bin/varnishd \\
\t-I$(top_builddir)/include \t-I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o PFX vmodtoolargs ?= --strict --boilerplate -o PFX
......
...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \ ...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/bin/varnishd \ -I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include -I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o vcc_if vmodtoolargs ?= --strict --boilerplate -o vcc_if
......
...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \ ...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/bin/varnishd \ -I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include -I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o vcc_if vmodtoolargs ?= --strict --boilerplate -o vcc_if
......
...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \ ...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/bin/varnishd \ -I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include -I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o vcc_if vmodtoolargs ?= --strict --boilerplate -o vcc_if
......
...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \ ...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/bin/varnishd \ -I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include -I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o vcc_if vmodtoolargs ?= --strict --boilerplate -o vcc_if
......
...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \ ...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/bin/varnishd \ -I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include -I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o vcc_if vmodtoolargs ?= --strict --boilerplate -o vcc_if
......
...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \ ...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/bin/varnishd \ -I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include -I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o vcc_if vmodtoolargs ?= --strict --boilerplate -o vcc_if
......
...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \ ...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/bin/varnishd \ -I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include -I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o vcc_if vmodtoolargs ?= --strict --boilerplate -o vcc_if
......
...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \ ...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/bin/varnishd \ -I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include -I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o vcc_if vmodtoolargs ?= --strict --boilerplate -o vcc_if
......
...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \ ...@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/bin/varnishd \ -I$(top_srcdir)/bin/varnishd \
-I$(top_builddir)/include -I$(top_builddir)/include
vmoddir = $(pkglibdir)/vmods
vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
vmodtoolargs ?= --strict --boilerplate -o vcc_if vmodtoolargs ?= --strict --boilerplate -o vcc_if
......
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