<div dir="ltr"><div><div>Hi all,</div><div><br></div><div>Here's a big patch for the (autotools) build system. It has been one of my pet peeves, so I took some time during evenings to make it non-recursive. I'm not sure everybody will be okay with it, but my OCD compelled me to try :-)</div><div><br></div><div>So, what does it means ?</div><div><br></div><div>Mainly, all the Makefile.am stay, but are included by the root one to create one flat Makefile. This shows in the number of final Makefile lines (after ./configure) : ~7800 now vs ~45000.</div><div><br></div><div>Also, make as all the the information it needs to compile in the right order, so there's no need to put the subdirs "in the right order" to avoid issues</div><div>From this, parallel builds should be faster (I'm currently working on the equivalent of a raspi, so I'm too cpu-constrained to verify this). if anyone want to try a "make -j32" on a recent machine, it should work beautifully.</div><div><br></div><div>The changes do not make the code pretty, but it isn't really worse either. But once applied, we should be able to get rid of a lot of "$(top_builddir)" and other superfluous variables.</div><div>Most of the changes are adding "path_of_the_subdir" to filenames. The point that annoys me is the installation part of some of the bin/varnishd/ and include/ headers that has to be done "by hand" because of their paths.</div><div><br></div><div>Oh, I forgot : no mor BUILT_SOURCES!</div><div><br></div><div>One big change is that you don't use "make -C subdir", as there is only one Makefile now, you have to run it from the top directory. The counterpart is that it's very easy to define meta-targets without shooting ourselves in the foot.</div><div><br></div><div>I tested it as best as I could, with -j1, -j32, install, dist, distcheckyieldsconsistent results AFAICT. Out-of-tree-build works too. I also built "all" with bmake, and it seemed to work.</div><div><br></div><div>Patch follows, you can also find it here : <a href="https://github.com/varnish/Varnish-Cache/compare/master...gquintard:WIP/non-recursive_build.patch">https://github.com/varnish/Varnish-Cache/compare/master...gquintard:WIP/non-recursive_build.patch</a></div><div>or the branch, directly on github : <a href="https://github.com/gquintard/Varnish-Cache/tree/WIP/non-recursive_build">https://github.com/gquintard/Varnish-Cache/tree/WIP/non-recursive_build</a></div><div>or the comparison with master : <a href="https://github.com/varnish/Varnish-Cache/compare/master...gquintard:WIP/non-recursive_build?diff=split&name=WIP%2Fnon-recursive_build">https://github.com/varnish/Varnish-Cache/compare/master...gquintard:WIP/non-recursive_build?diff=split&name=WIP%2Fnon-recursive_build</a></div><div><br></div><div>Cheers.</div><div><br></div><div>-- </div>Guillaume Quintard<br></div><div><br></div><div><div>---</div><div> Makefile.am | 75 +++++++++--</div><div> bin/Makefile.am | 14 --</div><div> bin/varnishadm/Makefile.am | 24 ++--</div><div> bin/varnishd/Makefile.am | 276 +++++++++++++++++++++-----------------</div><div> bin/varnishhist/Makefile.am | 41 +++---</div><div> bin/varnishlog/Makefile.am | 45 ++++---</div><div> bin/varnishncsa/Makefile.am | 53 ++++----</div><div> bin/varnishreplay/Makefile.am | 8 +-</div><div> bin/varnishstat/Makefile.am | 20 +--</div><div> bin/varnishtest/Makefile.am | 57 ++++----</div><div> bin/varnishtop/Makefile.am | 43 +++---</div><div> <a href="http://configure.ac">configure.ac</a> | 29 +---</div><div> doc/Makefile.am | 9 +-</div><div> doc/graphviz/Makefile.am | 41 +++---</div><div> doc/sphinx/Makefile.am | 148 +++++++++++---------</div><div> etc/Makefile.am | 12 +-</div><div> include/Makefile.am | 244 ++++++++++++++++++---------------</div><div> lib/Makefile.am | 23 ----</div><div> lib/libvarnish/Makefile.am | 87 ++++++------</div><div> lib/libvarnishapi/Makefile.am | 146 ++++++++++----------</div><div> lib/libvarnishcompat/Makefile.am | 14 +-</div><div> lib/libvarnishtools/Makefile.am | 6 +-</div><div> lib/libvcc/Makefile.am | 75 ++++++-----</div><div> lib/libvgz/Makefile.am | 54 ++++----</div><div> lib/libvmod_debug/Makefile.am | 49 +++----</div><div> lib/libvmod_directors/Makefile.am | 57 ++++----</div><div> lib/libvmod_std/Makefile.am | 55 ++++----</div><div> man/Makefile.am | 82 ++++++-----</div><div> 28 files changed, 945 insertions(+), 842 deletions(-)</div><div> delete mode 100644 bin/Makefile.am</div><div> delete mode 100644 lib/Makefile.am</div><div><br></div><div>diff --git a/Makefile.am b/Makefile.am</div><div>index e49505f..a1d1019 100644</div><div>--- a/Makefile.am</div><div>+++ b/Makefile.am</div><div>@@ -1,6 +1,66 @@</div><div> ACLOCAL_AMFLAGS = -I m4</div><div> </div><div>-SUBDIRS = include lib bin etc doc man</div><div>+CLEANFILES =</div><div>+DISTCLEANFILES =</div><div>+MAINTAINERCLEANFILES =</div><div>+EXTRA_DIST =</div><div>+bin_PROGRAMS =</div><div>+sbin_PROGRAMS =</div><div>+noinst_PROGRAMS =</div><div>+noinst_HEADERS =</div><div>+vmod_LTLIBRARIES =</div><div>+pkglib_LTLIBRARIES =</div><div>+dist_pkgdata_SCRIPTS =</div><div>+check_LTLIBRARIES =</div><div>+lib_LTLIBRARIES =</div><div>+noinst_LTLIBRARIES =</div><div>+BUILT_SOURCES =</div><div>+pkginclude_HEADERS =</div><div>+nobase_pkginclude_HEADERS =</div><div>+nobase_noinst_HEADERS =</div><div>+</div><div>+# etc</div><div>+include etc/Makefile.am</div><div>+</div><div>+# include</div><div>+include include/Makefile.am</div><div>+</div><div>+# bin</div><div>+include bin/varnishd/Makefile.am</div><div>+include bin/varnishlog/Makefile.am</div><div>+include bin/varnishncsa/Makefile.am</div><div>+include bin/varnishadm/Makefile.am</div><div>+include bin/varnishhist/Makefile.am</div><div>+include bin/varnishstat/Makefile.am</div><div>+include bin/varnishtop/Makefile.am</div><div>+include bin/varnishtest/Makefile.am</div><div>+# Disabling building of the tools while api is in flux</div><div>+#include bin/varnishreplay/Makefile.am</div><div>+</div><div>+# lib</div><div>+vmoddir = $(pkglibdir)/vmods</div><div>+vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py</div><div>+vmodtoolargs = --strict</div><div>+lib/libvmod_%.lo : include/vmod_abi.h</div><div>+</div><div>+include lib/libvarnish/Makefile.am</div><div>+include lib/libvarnishcompat/Makefile.am</div><div>+include lib/libvarnishtools/Makefile.am</div><div>+include lib/libvarnishapi/Makefile.am</div><div>+include lib/libvcc/Makefile.am</div><div>+include lib/libvgz/Makefile.am</div><div>+include lib/libvmod_debug/Makefile.am</div><div>+include lib/libvmod_std/Makefile.am</div><div>+include lib/libvmod_directors/Makefile.am</div><div>+</div><div>+RST2ANY_FLAGS = --halt=2</div><div>+# doc</div><div>+include doc/Makefile.am</div><div>+include doc/graphviz/Makefile.am</div><div>+include doc/sphinx/Makefile.am</div><div>+</div><div>+# man</div><div>+include man/Makefile.am</div><div> </div><div> pkgconfigdir = $(libdir)/pkgconfig</div><div> pkgconfig_DATA = varnishapi.pc</div><div>@@ -8,8 +68,8 @@ pkgconfig_DATA = varnishapi.pc</div><div> m4dir = $(datadir)/aclocal</div><div> m4_DATA = varnish.m4</div><div> </div><div>-CLEANFILES = cscope.in.out cscope.out cscope.po.out</div><div>-EXTRA_DIST = LICENSE autogen.sh <a href="http://varnishapi.pc.in">varnishapi.pc.in</a> varnish.m4</div><div>+CLEANFILES += cscope.in.out cscope.out cscope.po.out</div><div>+EXTRA_DIST += LICENSE autogen.sh <a href="http://varnishapi.pc.in">varnishapi.pc.in</a> varnish.m4</div><div> </div><div> DISTCHECK_CONFIGURE_FLAGS = \</div><div> --enable-developer-warnings \</div><div>@@ -17,19 +77,10 @@ DISTCHECK_CONFIGURE_FLAGS = \</div><div> --enable-dependency-tracking \</div><div> --enable-tests</div><div> </div><div>-install-data-local:</div><div>-<span class="" style="white-space:pre"> </span>$(install_sh) -d -m 0755 $(DESTDIR)$(localstatedir)/varnish</div><div>-</div><div>-</div><div> distcleancheck_listfiles = \</div><div> <span class="" style="white-space:pre"> </span>find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \</div><div> <span class="" style="white-space:pre"> </span>sh '{}' ';'</div><div> </div><div>-# XXX: This is a hack to ensure we have a built source tree when</div><div>-# running make dist If we had used non-recursive make we could have</div><div>-# solved it better, but we don't, so use this at least for now.</div><div>-LICENSE: all</div><div>-</div><div> cscope:</div><div> <span class="" style="white-space:pre"> </span>-rm -f cscope*</div><div> <span class="" style="white-space:pre"> </span>find . -name '*.[hcS]' > cscope.files</div><div>diff --git a/bin/Makefile.am b/bin/Makefile.am</div><div>deleted file mode 100644</div><div>index 8aa2ef9..0000000</div><div>--- a/bin/Makefile.am</div><div>+++ /dev/null</div><div>@@ -1,14 +0,0 @@</div><div>-#</div><div>-</div><div>-# Disabling building of the tools while api is in flux</div><div>-</div><div>-#SUBDIRS = varnishreplay</div><div>-SUBDIRS = \</div><div>-<span class="" style="white-space:pre"> </span>varnishadm \</div><div>-<span class="" style="white-space:pre"> </span>varnishd \</div><div>-<span class="" style="white-space:pre"> </span>varnishhist \</div><div>-<span class="" style="white-space:pre"> </span>varnishlog \</div><div>-<span class="" style="white-space:pre"> </span>varnishncsa \</div><div>-<span class="" style="white-space:pre"> </span>varnishstat \</div><div>-<span class="" style="white-space:pre"> </span>varnishtest \</div><div>-<span class="" style="white-space:pre"> </span>varnishtop</div><div>diff --git a/bin/varnishadm/Makefile.am b/bin/varnishadm/Makefile.am</div><div>index 9033e08..e372502 100644</div><div>--- a/bin/varnishadm/Makefile.am</div><div>+++ b/bin/varnishadm/Makefile.am</div><div>@@ -1,21 +1,21 @@</div><div> #</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+bin_varnishadm_varnishadm_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-bin_PROGRAMS = varnishadm</div><div>+bin_PROGRAMS += bin/varnishadm/varnishadm</div><div> </div><div>-varnishadm_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>varnishadm.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vas.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vsa.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vtcp.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vss.c</div><div>+bin_varnishadm_varnishadm_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishadm/varnishadm.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vas.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsa.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vtcp.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vss.c</div><div> </div><div>-varnishadm_CFLAGS = @LIBEDIT_CFLAGS@</div><div>+bin_varnishadm_varnishadm_CFLAGS = @LIBEDIT_CFLAGS@</div><div> </div><div>-varnishadm_LDADD = \</div><div>-<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div>-<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div>+bin_varnishadm_varnishadm_LDADD = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div> <span class="" style="white-space:pre"> </span>${PTHREAD_LIBS} ${RT_LIBS} ${NET_LIBS} @LIBEDIT_LIBS@ ${LIBM}</div><div>diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am</div><div>index e4d2ab5..df84905 100644</div><div>--- a/bin/varnishd/Makefile.am</div><div>+++ b/bin/varnishd/Makefile.am</div><div>@@ -1,138 +1,164 @@</div><div> #</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+bin_varnishd_varnishd_CPPFLAGS = \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishd \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/lib/libvgz \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/bin/varnishd \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-sbin_PROGRAMS = varnishd</div><div>-</div><div>-varnishd_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_acceptor.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_backend.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_backend_cfg.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_backend_probe.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_backend_tcp.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_ban.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_busyobj.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_cli.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_deliver_proc.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_director.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_esi_deliver.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_esi_fetch.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_esi_parse.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_expire.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_fetch.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_fetch_proc.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_gzip.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_hash.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_http.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_lck.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_main.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_mempool.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_obj.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_panic.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_pool.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_req.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_req_body.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_req_fsm.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_rfc2616.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_range.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_session.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_shmlog.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_vary.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_vcl.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_vrt.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_vrt_priv.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_vrt_re.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_vrt_var.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_vrt_vmod.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_wrk.c \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_ws.c \</div><div>-<span class="" style="white-space:pre"> </span>common/common_vsm.c \</div><div>-<span class="" style="white-space:pre"> </span>common/common_vsc.c \</div><div>-<span class="" style="white-space:pre"> </span>hash/hash_classic.c \</div><div>-<span class="" style="white-space:pre"> </span>hash/hash_critbit.c \</div><div>-<span class="" style="white-space:pre"> </span>hash/mgt_hash.c \</div><div>-<span class="" style="white-space:pre"> </span>hash/hash_simple_list.c \</div><div>-<span class="" style="white-space:pre"> </span>http1/cache_http1_deliver.c \</div><div>-<span class="" style="white-space:pre"> </span>http1/cache_http1_fetch.c \</div><div>-<span class="" style="white-space:pre"> </span>http1/cache_http1_fsm.c \</div><div>-<span class="" style="white-space:pre"> </span>http1/cache_http1_line.c \</div><div>-<span class="" style="white-space:pre"> </span>http1/cache_http1_pipe.c \</div><div>-<span class="" style="white-space:pre"> </span>http1/cache_http1_proto.c \</div><div>-<span class="" style="white-space:pre"> </span>http1/cache_http1_vfp.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_acceptor.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_child.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_cli.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_jail.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_jail_unix.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_jail_solaris.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_main.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_param.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_param_tbl.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_param_bits.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_param_tcp.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_param_tweak.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_pool.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_shmem.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_vcc.c \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_vcl.c \</div><div>-<span class="" style="white-space:pre"> </span>proxy/cache_proxy_proto.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/stevedore.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/mgt_stevedore.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/stevedore_utils.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/storage_file.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/storage_malloc.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/storage_persistent.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/mgt_storage_persistent.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/storage_persistent_silo.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/storage_persistent_subr.c \</div><div>-<span class="" style="white-space:pre"> </span>storage/storage_umem.c \</div><div>-<span class="" style="white-space:pre"> </span>waiter/mgt_waiter.c \</div><div>-<span class="" style="white-space:pre"> </span>waiter/cache_waiter.c \</div><div>-<span class="" style="white-space:pre"> </span>waiter/cache_waiter_epoll.c \</div><div>-<span class="" style="white-space:pre"> </span>waiter/cache_waiter_kqueue.c \</div><div>-<span class="" style="white-space:pre"> </span>waiter/cache_waiter_poll.c \</div><div>-<span class="" style="white-space:pre"> </span>waiter/cache_waiter_ports.c </div><div>-</div><div>-noinst_HEADERS = \</div><div>-<span class="" style="white-space:pre"> </span>builtin_vcl.h \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_esi.h \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_pool.h \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_priv.h \</div><div>-<span class="" style="white-space:pre"> </span>common/heritage.h \</div><div>-<span class="" style="white-space:pre"> </span>hash/hash_slinger.h \</div><div>-<span class="" style="white-space:pre"> </span>http1/cache_http1.h \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt.h \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_cli.h \</div><div>-<span class="" style="white-space:pre"> </span>mgt/mgt_param.h \</div><div>-<span class="" style="white-space:pre"> </span>storage/storage.h \</div><div>-<span class="" style="white-space:pre"> </span>storage/storage_persistent.h \</div><div>-<span class="" style="white-space:pre"> </span>waiter/waiter_priv.h \</div><div>-<span class="" style="white-space:pre"> </span>waiter/mgt_waiter.h</div><div>+sbin_PROGRAMS += bin/varnishd/varnishd</div><div>+</div><div>+bin_varnishd_varnishd_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_acceptor.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_backend.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_backend_cfg.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_backend_probe.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_backend_tcp.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_ban.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_busyobj.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_cli.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_deliver_proc.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_director.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_esi_deliver.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_esi_fetch.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_esi_parse.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_expire.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_fetch.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_fetch_proc.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_gzip.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_hash.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_http.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_lck.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_main.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_mempool.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_obj.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_panic.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_pool.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_req.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_req_body.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_req_fsm.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_rfc2616.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_range.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_session.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_shmlog.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_vary.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_vcl.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_vrt.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_vrt_priv.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_vrt_re.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_vrt_var.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_vrt_vmod.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_wrk.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_ws.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/common/common_vsm.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/common/common_vsc.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/hash/hash_classic.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/hash/hash_critbit.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/hash/mgt_hash.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/hash/hash_simple_list.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/http1/cache_http1_deliver.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/http1/cache_http1_fetch.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/http1/cache_http1_fsm.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/http1/cache_http1_line.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/http1/cache_http1_pipe.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/http1/cache_http1_proto.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/http1/cache_http1_vfp.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_acceptor.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_child.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_cli.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_jail.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_jail_unix.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_jail_solaris.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_main.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_param.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_param_tbl.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_param_bits.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_param_tcp.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_param_tweak.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_pool.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_shmem.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_vcc.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_vcl.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/proxy/cache_proxy_proto.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/stevedore.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/mgt_stevedore.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/stevedore_utils.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/storage_file.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/storage_malloc.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/storage_persistent.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/mgt_storage_persistent.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/storage_persistent_silo.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/storage_persistent_subr.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/storage_umem.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/waiter/mgt_waiter.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/waiter/cache_waiter.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/waiter/cache_waiter_epoll.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/waiter/cache_waiter_kqueue.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/waiter/cache_waiter_poll.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/waiter/cache_waiter_ports.c </div><div>+</div><div>+noinst_HEADERS += \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/builtin_vcl.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_esi.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_pool.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_priv.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/common/heritage.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/hash/hash_slinger.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/http1/cache_http1.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_cli.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/mgt/mgt_param.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/storage.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/storage/storage_persistent.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/waiter/waiter_priv.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/waiter/mgt_waiter.h</div><div> </div><div> # Headers for use with vmods</div><div>-nobase_pkginclude_HEADERS = \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache.h \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_filter.h \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_backend.h \</div><div>-<span class="" style="white-space:pre"> </span>cache/cache_director.h \</div><div>-<span class="" style="white-space:pre"> </span>common/common.h \</div><div>-<span class="" style="white-space:pre"> </span>common/params.h \</div><div>-<span class="" style="white-space:pre"> </span>waiter/waiter.h</div><div>-</div><div>-varnishd_CFLAGS = \</div><div>+public_varnishd_headers = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_filter.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_backend.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/cache/cache_director.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/common/common.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/common/params.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/waiter/waiter.h</div><div>+</div><div>+# This saddens me, but nobase will strip the path completely</div><div>+# and we want to change 'bin/varnishd/' to 'varnish/cache/'</div><div>+# XXX one mkdir per file is wasteful, but we won't risk</div><div>+# forgetting subdirs</div><div>+install-data-local: install-public-varnishd-headers</div><div>+install-public-varnishd-headers:</div><div>+<span class="" style="white-space:pre"> </span>for i in $(public_varnishd_headers); do \</div><div>+<span class="" style="white-space:pre"> </span>h_dir="$$(dirname $(DESTDIR)$(includedir)/varnish`echo $$i |sed s@bin/varnishd@@`)"; \</div><div>+<span class="" style="white-space:pre"> </span>$(install_sh) -d -m 0755 $$h_dir; \</div><div>+<span class="" style="white-space:pre"> </span>$(INSTALL_HEADER) $(srcdir)/$$i $$h_dir; \</div><div>+<span class="" style="white-space:pre"> </span>done</div><div>+</div><div>+#<span class="" style="white-space:pre"> </span>chmod +w $$(dirname $(includedir)/`echo $$i |</div><div>+#<span class="" style="white-space:pre"> </span> sed s@bin/varnishd@varnish@`);</div><div>+uninstall-hook: uninstall-public-varnishd-headers </div><div>+uninstall-public-varnishd-headers :</div><div>+<span class="" style="white-space:pre"> </span>for i in $(public_varnishd_headers); do \</div><div>+<span class="" style="white-space:pre"> </span>rm -f $(DESTDIR)$(includedir)/`echo $$i | \</div><div>+<span class="" style="white-space:pre"> </span>sed s@bin/varnishd@varnish@`; \</div><div>+<span class="" style="white-space:pre"> </span>done</div><div>+</div><div>+.PHONY: install-public-varnishd-headers uninstall-public-varnishd-headers</div><div>+</div><div>+EXTRA_DIST += $(public_varnishd_headers)</div><div>+</div><div>+bin_varnishd_varnishd_CFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>@PCRE_CFLAGS@ \</div><div> <span class="" style="white-space:pre"> </span>-DVARNISHD_IS_NOT_A_VMOD \</div><div> -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \</div><div> <span class="" style="white-space:pre"> </span>-DVARNISH_VMOD_DIR='"${pkglibdir}/vmods"' \</div><div> <span class="" style="white-space:pre"> </span>-DVARNISH_VCL_DIR='"${varnishconfdir}"'</div><div> </div><div>-varnishd_LDFLAGS = -export-dynamic</div><div>+bin_varnishd_varnishd_LDFLAGS = -export-dynamic</div><div> </div><div>-varnishd_LDADD = \</div><div>+bin_varnishd_varnishd_LDADD = \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnish/<a href="http://libvarnish.la">libvarnish.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvcc/<a href="http://libvcc.la">libvcc.la</a> \</div><div>@@ -141,13 +167,15 @@ varnishd_LDADD = \</div><div> <span class="" style="white-space:pre"> </span>@PCRE_LIBS@ \</div><div> <span class="" style="white-space:pre"> </span>${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${LIBUMEM}</div><div> </div><div>-EXTRA_DIST = builtin.vcl</div><div>-DISTCLEANFILES = builtin_vcl.h</div><div>+$(bin_varnishd_varnishd_OBJECTS) : include/tbl/vcl_returns.h</div><div>+</div><div>+EXTRA_DIST += bin/varnishd/builtin.vcl</div><div>+DISTCLEANFILES += bin/varnishd/builtin_vcl.h</div><div> </div><div> #</div><div> # Turn the builtin.vcl file into a C-string we can include in the program.</div><div> #</div><div>-builtin_vcl.h:<span class="" style="white-space:pre"> </span>builtin.vcl</div><div>+bin/varnishd/builtin_vcl.h:<span class="" style="white-space:pre"> </span>bin/varnishd/builtin.vcl</div><div> <span class="" style="white-space:pre"> </span>echo '/*' > $@</div><div> <span class="" style="white-space:pre"> </span>echo ' * NB: This file is machine generated, DO NOT EDIT!' >> $@</div><div> <span class="" style="white-space:pre"> </span>echo ' *' >> $@</div><div>@@ -157,7 +185,7 @@ builtin_vcl.h:<span class="" style="white-space:pre"> </span>builtin.vcl</div><div> <span class="" style="white-space:pre"> </span>echo '' >> $@</div><div> <span class="" style="white-space:pre"> </span>sed -e 's/"/\\"/g' \</div><div> <span class="" style="white-space:pre"> </span> -e 's/$$/\\n"/' \</div><div>-<span class="" style="white-space:pre"> </span> -e 's/^/ "/' $(srcdir)/builtin.vcl >> $@</div><div>+<span class="" style="white-space:pre"> </span> -e 's/^/ "/' $(srcdir)/bin/varnishd/builtin.vcl >> $@</div><div> </div><div> # Explicitly record dependency</div><div>-mgt/mgt_vcc.c:<span class="" style="white-space:pre"> </span>builtin_vcl.h</div><div>+bin/varnishd/mgt/mgt_vcc.c:<span class="" style="white-space:pre"> </span>bin/varnishd/builtin_vcl.h</div><div>diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am</div><div>index 5904430..eeaa1a2 100644</div><div>--- a/bin/varnishhist/Makefile.am</div><div>+++ b/bin/varnishhist/Makefile.am</div><div>@@ -1,29 +1,36 @@</div><div> #</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+bin_varnishhist_varnishhist_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishhist/ \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-bin_PROGRAMS = varnishhist</div><div>+bin_PROGRAMS += bin/varnishhist/varnishhist</div><div> </div><div>-varnishhist_SOURCES = varnishhist.c \</div><div>-<span class="" style="white-space:pre"> </span>varnishhist_options.h \</div><div>-<span class="" style="white-space:pre"> </span>varnishhist_options.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vas.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/version.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vpf.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vtim.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/flopen.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnishtools/vut.c</div><div>+bin_varnishhist_varnishhist_SOURCES = bin/varnishhist/varnishhist.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishhist/varnishhist_options.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishhist/varnishhist_options.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vas.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/version.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vpf.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vtim.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/flopen.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/vut.c</div><div> </div><div>-varnishhist_LDADD = \</div><div>+bin_varnishhist_varnishhist_LDADD = \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div> <span class="" style="white-space:pre"> </span>-lm \</div><div> <span class="" style="white-space:pre"> </span>@CURSES_LIB@ ${RT_LIBS} ${PTHREAD_LIBS}</div><div> </div><div>-noinst_PROGRAMS = varnishhist_opt2rst</div><div>-varnishhist_opt2rst_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>varnishhist_options.h \</div><div>-<span class="" style="white-space:pre"> </span>varnishhist_options.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnishtools/opt2rst.c</div><div>+noinst_PROGRAMS += bin/varnishhist/varnishhist_opt2rst</div><div>+</div><div>+bin_varnishhist_varnishhist_opt2rst_CPPFLAGS = \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishhist/ \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div>+</div><div>+bin_varnishhist_varnishhist_opt2rst_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishhist/varnishhist_options.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishhist/varnishhist_options.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/opt2rst.c</div><div>diff --git a/bin/varnishlog/Makefile.am b/bin/varnishlog/Makefile.am</div><div>index 2df9415..4e04540 100644</div><div>--- a/bin/varnishlog/Makefile.am</div><div>+++ b/bin/varnishlog/Makefile.am</div><div>@@ -1,30 +1,37 @@</div><div> #</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+bin_varnishlog_varnishlog_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishlog \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-bin_PROGRAMS = varnishlog</div><div>+bin_PROGRAMS += bin/varnishlog/varnishlog</div><div> </div><div>-varnishlog_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>varnishlog.c \</div><div>-<span class="" style="white-space:pre"> </span>varnishlog_options.h \</div><div>-<span class="" style="white-space:pre"> </span>varnishlog_options.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnishtools/vut.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vas.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/flopen.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/version.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vsb.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vpf.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vtim.c</div><div>+bin_varnishlog_varnishlog_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishlog/varnishlog.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishlog/varnishlog_options.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishlog/varnishlog_options.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/vut.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vas.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/flopen.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/version.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsb.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vpf.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vtim.c</div><div> </div><div>-varnishlog_LDADD = \</div><div>+bin_varnishlog_varnishlog_LDADD = \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div> <span class="" style="white-space:pre"> </span>${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}</div><div> </div><div>-noinst_PROGRAMS = varnishlog_opt2rst</div><div>-varnishlog_opt2rst_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>varnishlog_options.h \</div><div>-<span class="" style="white-space:pre"> </span>varnishlog_options.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnishtools/opt2rst.c</div><div>+noinst_PROGRAMS += bin/varnishlog/varnishlog_opt2rst</div><div>+</div><div>+bin_varnishlog_varnishlog_opt2rst_CPPFLAGS = \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishlog \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div>+</div><div>+bin_varnishlog_varnishlog_opt2rst_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishlog/varnishlog_options.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishlog/varnishlog_options.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/opt2rst.c</div><div>diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am</div><div>index d63df61..c8f7925 100644</div><div>--- a/bin/varnishncsa/Makefile.am</div><div>+++ b/bin/varnishncsa/Makefile.am</div><div>@@ -1,32 +1,39 @@</div><div> #</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+bin_varnishncsa_varnishncsa_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishncsa \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-bin_PROGRAMS = varnishncsa</div><div>+bin_PROGRAMS += bin/varnishncsa/varnishncsa</div><div> </div><div>-varnishncsa_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>varnishncsa.c \</div><div>-<span class="" style="white-space:pre"> </span>varnishncsa_options.h \</div><div>-<span class="" style="white-space:pre"> </span>varnishncsa_options.c \</div><div>-<span class="" style="white-space:pre"> </span>base64.h \</div><div>-<span class="" style="white-space:pre"> </span>base64.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnishtools/vut.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vas.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/flopen.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/version.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vpf.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vtim.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vsb.c</div><div>+bin_varnishncsa_varnishncsa_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishncsa/varnishncsa.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishncsa/varnishncsa_options.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishncsa/varnishncsa_options.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishncsa/base64.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishncsa/base64.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/vut.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vas.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/flopen.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/version.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vpf.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vtim.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsb.c</div><div> </div><div>-varnishncsa_LDADD = \</div><div>-<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div>-<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div>+bin_varnishncsa_varnishncsa_LDADD = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div> <span class="" style="white-space:pre"> </span>${RT_LIBS} ${LIBM}</div><div> </div><div>-noinst_PROGRAMS = varnishncsa_opt2rst</div><div>-varnishncsa_opt2rst_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>varnishncsa_options.h \</div><div>-<span class="" style="white-space:pre"> </span>varnishncsa_options.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnishtools/opt2rst.c</div><div>+noinst_PROGRAMS += bin/varnishncsa/varnishncsa_opt2rst</div><div>+</div><div>+bin_varnishncsa_varnishncsa_opt2rst_CPPFLAGS = \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishncsa \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div>+</div><div>+bin_varnishncsa_varnishncsa_opt2rst_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishncsa/varnishncsa_options.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishncsa/varnishncsa_options.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/opt2rst.c</div><div>diff --git a/bin/varnishreplay/Makefile.am b/bin/varnishreplay/Makefile.am</div><div>index 38d1c30..4610bc5 100644</div><div>--- a/bin/varnishreplay/Makefile.am</div><div>+++ b/bin/varnishreplay/Makefile.am</div><div>@@ -1,18 +1,18 @@</div><div> #</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+bin_varnishreplay_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-bin_PROGRAMS = varnishreplay</div><div>+bin_PROGRAMS += bin/varnishreplay/varnishreplay</div><div> </div><div>-varnishreplay_SOURCES = \</div><div>+bin_varnishreplay_varnishreplay_SOURCES = \</div><div> <span class="" style="white-space:pre"> </span>varnishreplay.c \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vas.c \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vtcp.c \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vss.c</div><div> </div><div>-varnishreplay_LDADD = \</div><div>+bin_varnishreplay_varnishreplay_LDADD = \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div> <span class="" style="white-space:pre"> </span>${RT_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM}</div><div>diff --git a/bin/varnishstat/Makefile.am b/bin/varnishstat/Makefile.am</div><div>index 664131d..891569f 100644</div><div>--- a/bin/varnishstat/Makefile.am</div><div>+++ b/bin/varnishstat/Makefile.am</div><div>@@ -1,21 +1,21 @@</div><div> #</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+bin_varnishstat_varnishstat_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-bin_PROGRAMS = varnishstat</div><div>+bin_PROGRAMS += bin/varnishstat/varnishstat</div><div> </div><div>-varnishstat_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>varnishstat.h \</div><div>+bin_varnishstat_varnishstat_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishstat/varnishstat.h \</div><div> <span class="" style="white-space:pre"> </span>\</div><div>-<span class="" style="white-space:pre"> </span>varnishstat.c \</div><div>-<span class="" style="white-space:pre"> </span>varnishstat_curses.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vas.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/version.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vtim.c</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishstat/varnishstat.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishstat/varnishstat_curses.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vas.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/version.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vtim.c</div><div> </div><div>-varnishstat_LDADD = \</div><div>+bin_varnishstat_varnishstat_LDADD = \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div> <span class="" style="white-space:pre"> </span>@CURSES_LIB@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}</div><div>diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am</div><div>index 2506a8a..58a48d3 100644</div><div>--- a/bin/varnishtest/Makefile.am</div><div>+++ b/bin/varnishtest/Makefile.am</div><div>@@ -1,51 +1,50 @@</div><div> #</div><div> </div><div>-VTC_LOG_COMPILER = ./varnishtest -v -i</div><div>+VTC_LOG_COMPILER = bin/varnishtest/varnishtest -v -i</div><div> TEST_EXTENSIONS = .vtc</div><div> TESTS = @VTC_TESTS@</div><div> </div><div>-# Make sure we run check-local first</div><div>-check: check-am check-local</div><div>-check-am: check-local</div><div>+check: lib/libvmod_debug/<a href="http://libvmod_debug.la">libvmod_debug.la</a> verify-tests-list</div><div> # See if list of checks have changed, recheck</div><div>-check-local:</div><div>-<span class="" style="white-space:pre"> </span>if [ "$$(cd $(srcdir) && echo tests/*.vtc)" != "@VTC_TESTS@" ]; then \</div><div>-<span class="" style="white-space:pre"> </span>cd $(top_builddir) && ./config.status --recheck ; \</div><div>+verify-tests-list :</div><div>+<span class="" style="white-space:pre"> </span>if [ "$$(cd $(top_srcdir) && echo bin/varnishtest/tests/*.vtc)" != "@VTC_TESTS@" ]; then \</div><div>+<span class="" style="white-space:pre"> </span>./config.status --recheck ; \</div><div> <span class="" style="white-space:pre"> </span>fi</div><div> </div><div>-DISTCLEANFILES = _.ok</div><div>+DISTCLEANFILES += bin/varnishtest/_.ok</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+</div><div>+bin_varnishtest_varnishtest_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/lib/libvgz</div><div> </div><div>-bin_PROGRAMS =<span class="" style="white-space:pre"> </span>varnishtest</div><div>-</div><div>-varnishtest_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vtc.c \</div><div>-<span class="" style="white-space:pre"> </span>vtc.h \</div><div>-<span class="" style="white-space:pre"> </span>vmods.h \</div><div>-<span class="" style="white-space:pre"> </span>programs.h \</div><div>-<span class="" style="white-space:pre"> </span>vtc_client.c \</div><div>-<span class="" style="white-space:pre"> </span>vtc_http.c \</div><div>-<span class="" style="white-space:pre"> </span>vtc_main.c \</div><div>-<span class="" style="white-space:pre"> </span>vtc_log.c \</div><div>-<span class="" style="white-space:pre"> </span>vtc_sema.c \</div><div>-<span class="" style="white-space:pre"> </span>vtc_server.c \</div><div>-<span class="" style="white-space:pre"> </span>vtc_varnish.c \</div><div>-<span class="" style="white-space:pre"> </span>vtc_logexp.c \</div><div>-<span class="" style="white-space:pre"> </span>vtc_process.c</div><div>-</div><div>-varnishtest_LDADD = \</div><div>+bin_PROGRAMS +=<span class="" style="white-space:pre"> </span>bin/varnishtest/varnishtest</div><div>+</div><div>+bin_varnishtest_varnishtest_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vmods.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/programs.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc_client.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc_http.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc_main.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc_log.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc_sema.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc_server.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc_varnish.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc_logexp.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtest/vtc_process.c</div><div>+</div><div>+bin_varnishtest_varnishtest_LDADD = \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnish/<a href="http://libvarnish.la">libvarnish.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvgz/<a href="http://libvgz.la">libvgz.la</a> \</div><div> <span class="" style="white-space:pre"> </span>${LIBM} ${PTHREAD_LIBS}</div><div> </div><div>-varnishtest_CFLAGS = \</div><div>+bin_varnishtest_varnishtest_CFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-DTOP_BUILDDIR='"${top_builddir}"'</div><div> </div><div>-EXTRA_DIST = $(top_srcdir)/bin/varnishtest/tests/*.vtc \</div><div>+EXTRA_DIST += @VTC_TESTS@ \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/bin/varnishtest/tests/README</div><div>diff --git a/bin/varnishtop/Makefile.am b/bin/varnishtop/Makefile.am</div><div>index f48e972..82d3d6c 100644</div><div>--- a/bin/varnishtop/Makefile.am</div><div>+++ b/bin/varnishtop/Makefile.am</div><div>@@ -1,30 +1,35 @@</div><div> #</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+bin_varnishtop_varnishtop_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishtop \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-bin_PROGRAMS = varnishtop</div><div>+bin_PROGRAMS += bin/varnishtop/varnishtop</div><div> </div><div>-varnishtop_SOURCES = varnishtop.c \</div><div>-<span class="" style="white-space:pre"> </span>varnishtop_options.h \</div><div>-<span class="" style="white-space:pre"> </span>varnishtop_options.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnishtools/vut.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vas.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/flopen.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/version.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vpf.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vtim.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnish/vsb.c</div><div>+bin_varnishtop_varnishtop_SOURCES = bin/varnishtop/varnishtop.c \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtop/varnishtop_options.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtop/varnishtop_options.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/vut.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vas.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/flopen.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/version.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vpf.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vtim.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsb.c</div><div> </div><div>-</div><div>-varnishtop_LDADD = \</div><div>+bin_varnishtop_varnishtop_LDADD = \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a> \</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a> \</div><div> <span class="" style="white-space:pre"> </span>@CURSES_LIB@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}</div><div> </div><div>-noinst_PROGRAMS = varnishtop_opt2rst</div><div>-varnishtop_opt2rst_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>varnishtop_options.h \</div><div>-<span class="" style="white-space:pre"> </span>varnishtop_options.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnishtools/opt2rst.c</div><div>+noinst_PROGRAMS += bin/varnishtop/varnishtop_opt2rst</div><div>+bin_varnishtop_varnishtop_opt2rst_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtop/varnishtop_options.h \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishtop/varnishtop_options.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/opt2rst.c</div><div>+</div><div>+bin_varnishtop_varnishtop_opt2rst_CPPFLAGS = \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishtop \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div>\ No newline at end of file</div><div>diff --git a/<a href="http://configure.ac">configure.ac</a> b/<a href="http://configure.ac">configure.ac</a></div><div>index 48af690..7eb57b5 100644</div><div>--- a/<a href="http://configure.ac">configure.ac</a></div><div>+++ b/<a href="http://configure.ac">configure.ac</a></div><div>@@ -16,7 +16,7 @@ AC_CANONICAL_SYSTEM</div><div> AC_LANG(C)</div><div> </div><div> AM_MAINTAINER_MODE([disable])</div><div>-AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests])</div><div>+AM_INIT_AUTOMAKE([1.11 foreign color-tests parallel-tests subdir-objects])</div><div> AM_SILENT_RULES([yes])</div><div> AC_DISABLE_STATIC</div><div> AC_PROG_LIBTOOL</div><div>@@ -623,7 +623,7 @@ if test "$enable_pcre_jit" = yes; then</div><div> fi</div><div> </div><div> # Stupid automake needs this</div><div>-VTC_TESTS="$(cd $srcdir/bin/varnishtest && echo tests/*.vtc)"</div><div>+VTC_TESTS="$(cd ${srcdir} && echo bin/varnishtest/tests/*.vtc)"</div><div> AC_SUBST(VTC_TESTS)</div><div> </div><div> # Make sure this include dir exists</div><div>@@ -632,32 +632,7 @@ AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P doc/sphinx/include])</div><div> # Generate output</div><div> AC_CONFIG_FILES([</div><div> Makefile</div><div>- bin/Makefile</div><div>- bin/varnishadm/Makefile</div><div>- bin/varnishd/Makefile</div><div>- bin/varnishlog/Makefile</div><div>- bin/varnishstat/Makefile</div><div>- bin/varnishtop/Makefile</div><div>- bin/varnishhist/Makefile</div><div>- bin/varnishtest/Makefile</div><div>- bin/varnishncsa/Makefile</div><div>- doc/Makefile</div><div>- doc/graphviz/Makefile</div><div>- doc/sphinx/Makefile</div><div> doc/sphinx/conf.py</div><div>- etc/Makefile</div><div>- include/Makefile</div><div>- lib/Makefile</div><div>- lib/libvarnish/Makefile</div><div>- lib/libvarnishapi/Makefile</div><div>- lib/libvarnishtools/Makefile</div><div>- lib/libvarnishcompat/Makefile</div><div>- lib/libvcc/Makefile</div><div>- lib/libvgz/Makefile</div><div>- lib/libvmod_debug/Makefile</div><div>- lib/libvmod_std/Makefile</div><div>- lib/libvmod_directors/Makefile</div><div>- man/Makefile</div><div> varnishapi.pc</div><div> varnishapi-uninstalled.pc</div><div> ])</div><div>diff --git a/doc/Makefile.am b/doc/Makefile.am</div><div>index e420a99..1279135 100644</div><div>--- a/doc/Makefile.am</div><div>+++ b/doc/Makefile.am</div><div>@@ -1,10 +1,8 @@</div><div> #</div><div> #</div><div>-RST2ANY_FLAGS = --halt=2</div><div>+EXTRA_DIST += doc/changes.rst doc/changes.html</div><div> </div><div>-EXTRA_DIST = changes.rst changes.html</div><div>-</div><div>-changes.html: changes.rst</div><div>+doc/changes.html: doc/changes.rst</div><div> if HAVE_RST2HTML</div><div> <span class="" style="white-space:pre"> </span>${RST2HTML} ${RST2ANY_FLAGS} $? $@</div><div> else</div><div>@@ -13,6 +11,3 @@ else</div><div> <span class="" style="white-space:pre"> </span>@echo "========================================"</div><div> <span class="" style="white-space:pre"> </span>@false</div><div> endif</div><div>-</div><div>-# build graphviz before sphinx, so sphinx docs can use svg output</div><div>-SUBDIRS = graphviz sphinx</div><div>diff --git a/doc/graphviz/Makefile.am b/doc/graphviz/Makefile.am</div><div>index acbe4fe..fc5b685 100644</div><div>--- a/doc/graphviz/Makefile.am</div><div>+++ b/doc/graphviz/Makefile.am</div><div>@@ -2,38 +2,32 @@</div><div> </div><div> # for an out-of-tree build, sphinx needs the output in builddir</div><div> # XXX is there a better way to do this?</div><div>+# .PHONY is required as VPATH will happily register the files in</div><div>+# buildi</div><div> </div><div>-.PHONY: link_srcdir</div><div>-</div><div>-link_srcdir:</div><div>-<span class="" style="white-space:pre"> </span>if test "x$(srcdir)" != "x$(builddir)" && \</div><div>-<span class="" style="white-space:pre"> </span> test ! -f $(builddir)/cache_http1_fsm.svg ; then \</div><div>-<span class="" style="white-space:pre"> </span>d=`pwd`/$(builddir) ; \</div><div>-<span class="" style="white-space:pre"> </span>cd $(srcdir) && find . -name \*.svg -type f | \</div><div>-<span class="" style="white-space:pre"> </span>cpio -ldmp $${d} ; \</div><div>-<span class="" style="white-space:pre"> </span>fi</div><div>-</div><div>-dist-hook:</div><div>-<span class="" style="white-space:pre"> </span>$(MAKE) html</div><div>+dist: html</div><div> </div><div> # You can set these variables from the command line.</div><div> # this is a4, letter is 8.5,11</div><div> SIZE<span class="" style="white-space:pre"> </span> = 8.4,11.7</div><div> </div><div>-EXTRA_DIST = $(srcdir)/*.dot</div><div>+EXTRA_DIST += \</div><div>+<span class="" style="white-space:pre"> </span>doc/graphviz/cache_http1_fsm.dot \</div><div>+<span class="" style="white-space:pre"> </span>doc/graphviz/cache_req_fsm.dot \</div><div>+<span class="" style="white-space:pre"> </span>doc/graphviz/cache_fetch.dot</div><div> </div><div> if HAVE_DOT</div><div> PDFS = \</div><div>-<span class="" style="white-space:pre"> </span>cache_http1_fsm.pdf \</div><div>-<span class="" style="white-space:pre"> </span>cache_req_fsm.pdf \</div><div>-<span class="" style="white-space:pre"> </span>cache_fetch.pdf</div><div>+<span class="" style="white-space:pre"> </span>doc/graphviz/cache_http1_fsm.pdf \</div><div>+<span class="" style="white-space:pre"> </span>doc/graphviz/cache_req_fsm.pdf \</div><div>+<span class="" style="white-space:pre"> </span>doc/graphviz/cache_fetch.pdf</div><div> </div><div> SVGS = \</div><div>-<span class="" style="white-space:pre"> </span>cache_http1_fsm.svg \</div><div>-<span class="" style="white-space:pre"> </span>cache_req_fsm.svg \</div><div>-<span class="" style="white-space:pre"> </span>cache_fetch.svg</div><div>+<span class="" style="white-space:pre"> </span>doc/graphviz/cache_http1_fsm.svg \</div><div>+<span class="" style="white-space:pre"> </span>doc/graphviz/cache_req_fsm.svg \</div><div>+<span class="" style="white-space:pre"> </span>doc/graphviz/cache_fetch.svg</div><div> </div><div>-CLEANFILES = \</div><div>+CLEANFILES += \</div><div> <span class="" style="white-space:pre"> </span>$(PDFS)<span class="" style="white-space:pre"> </span>\</div><div> <span class="" style="white-space:pre"> </span>$(SVGS)</div><div> endif</div><div>@@ -46,7 +40,7 @@ if ! HAVE_DOT</div><div> <span class="" style="white-space:pre"> </span>@false</div><div> endif</div><div> </div><div>-html: $(SVGS) link_srcdir</div><div>+graphviz: $(SVGS)</div><div> if ! HAVE_DOT</div><div> <span class="" style="white-space:pre"> </span>@echo ===================================================</div><div> <span class="" style="white-space:pre"> </span>@echo You need graphviz installed to generate html output</div><div>@@ -55,11 +49,14 @@ if ! HAVE_DOT</div><div> endif</div><div> </div><div> # XXX does not fit onto a4 unless in landscape</div><div>-cache_fetch.pdf: cache_fetch.dot</div><div>+doc/graphviz/cache_fetch.pdf: doc/graphviz/cache_fetch.dot</div><div>+<span class="" style="white-space:pre"> </span>mkdir -p $(top_builddir)/doc/graphviz</div><div> <span class="" style="white-space:pre"> </span>@DOT@ -Tpdf -Gsize=$(SIZE) -Grotate=90 $< >$@</div><div> </div><div> %.pdf: %.dot</div><div>+<span class="" style="white-space:pre"> </span>mkdir -p $(top_builddir)/doc/graphviz</div><div> <span class="" style="white-space:pre"> </span>@DOT@ -Tpdf -Gsize=$(SIZE) $< >$@</div><div> </div><div> %.svg: %.dot</div><div>+<span class="" style="white-space:pre"> </span>mkdir -p $(top_builddir)/doc/graphviz</div><div> <span class="" style="white-space:pre"> </span>@DOT@ -Tsvg $< >$@</div><div>diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am</div><div>index 6d71c14..01114cb 100644</div><div>--- a/doc/sphinx/Makefile.am</div><div>+++ b/doc/sphinx/Makefile.am</div><div>@@ -5,12 +5,12 @@</div><div> SPHINXOPTS =</div><div> SPHINXBUILD = sphinx-build -W -q -N</div><div> PAPER = a4</div><div>-BUILDDIR = build</div><div>+BUILDDIR = $(builddir)/doc/sphinx/build</div><div> </div><div> # Internal variables.</div><div> PAPEROPT_a4 = -D latex_paper_size=a4</div><div> PAPEROPT_letter = -D latex_paper_size=letter</div><div>-ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(builddir)</div><div>+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(builddir)/doc/sphinx</div><div> </div><div> .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest</div><div> </div><div>@@ -27,23 +27,18 @@ help:</div><div> <span class="" style="white-space:pre"> </span>@echo " linkcheck to check all external links for integrity"</div><div> <span class="" style="white-space:pre"> </span>@echo " doctest to run all doctests embedded in the documentation (if enabled)"</div><div> </div><div>-clean:</div><div>-<span class="" style="white-space:pre"> </span>-rm -rf $(BUILDDIR)/*</div><div>+clean-local: sphinx-clean</div><div> </div><div> # use index.rst as an indicator if we have copied already</div><div> .PHONY: link_srcdir</div><div> link_srcdir:</div><div> <span class="" style="white-space:pre"> </span>if test "x$(srcdir)" != "x$(builddir)" && test ! -f index.rst ; then \</div><div>-<span class="" style="white-space:pre"> </span>d=`pwd`/$(builddir) ; \</div><div>-<span class="" style="white-space:pre"> </span>cd $(srcdir) && find . -type f | cpio -ldmp $${d} ; \</div><div>+<span class="" style="white-space:pre"> </span>d=`pwd`/$(builddir)/doc/sphinx ; \</div><div>+<span class="" style="white-space:pre"> </span>cd $(srcdir)/doc/sphinx/ && find . -type f | cpio -ldmp $${d} ; \</div><div>+<span class="" style="white-space:pre"> </span>chmod -R +w $${d} ;\</div><div> <span class="" style="white-space:pre"> </span>fi</div><div> </div><div>-# work around for make html called within doc/sphinx</div><div>-.PHONY: graphviz</div><div>-graphviz:</div><div>-<span class="" style="white-space:pre"> </span>cd ../graphviz && $(MAKE) html</div><div>-</div><div>-sphinx_prereq: link_srcdir graphviz conf.py</div><div>+sphinx_prereq: link_srcdir graphviz doc/sphinx/conf.py</div><div> </div><div> html: sphinx_prereq</div><div> <span class="" style="white-space:pre"> </span>$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html</div><div>@@ -103,71 +98,100 @@ doctest: sphinx_prereq</div><div> <span class="" style="white-space:pre"> </span>@echo "Testing of doctests in the sources finished, look at the " \</div><div> <span class="" style="white-space:pre"> </span> "results in $(BUILDDIR)/doctest/output.txt."</div><div> </div><div>-EXTRA_DIST = \</div><div>-<span class="" style="white-space:pre"> </span>conf.py \</div><div>-<span class="" style="white-space:pre"> </span>index.rst \</div><div>-<span class="" style="white-space:pre"> </span>include \</div><div>-<span class="" style="white-space:pre"> </span>glossary \</div><div>-<span class="" style="white-space:pre"> </span>installation \</div><div>-<span class="" style="white-space:pre"> </span>phk \</div><div>-<span class="" style="white-space:pre"> </span>tutorial \</div><div>-<span class="" style="white-space:pre"> </span>users-guide \</div><div>-<span class="" style="white-space:pre"> </span>whats-new</div><div>-</div><div>-dist-hook:</div><div>-<span class="" style="white-space:pre"> </span>$(MAKE) html</div><div>+EXTRA_DIST += \</div><div>+<span class="" style="white-space:pre"> </span>doc/sphinx/conf.py \</div><div>+<span class="" style="white-space:pre"> </span>doc/sphinx/index.rst \</div><div>+<span class="" style="white-space:pre"> </span>doc/sphinx/include \</div><div>+<span class="" style="white-space:pre"> </span>doc/sphinx/glossary \</div><div>+<span class="" style="white-space:pre"> </span>doc/sphinx/installation \</div><div>+<span class="" style="white-space:pre"> </span>doc/sphinx/phk \</div><div>+<span class="" style="white-space:pre"> </span>doc/sphinx/tutorial \</div><div>+<span class="" style="white-space:pre"> </span>doc/sphinx/users-guide \</div><div>+<span class="" style="white-space:pre"> </span>doc/sphinx/whats-new</div><div>+</div><div>+dist-hook: sphinx-dist</div><div>+.PHONY: sphinx-dist</div><div>+sphinx-dist:</div><div> <span class="" style="white-space:pre"> </span>rm -rf $(BUILDDIR)/doctrees</div><div>-<span class="" style="white-space:pre"> </span>cp -r $(BUILDDIR)/html $(distdir)/../</div><div>+<span class="" style="white-space:pre"> </span>cp -r $(BUILDDIR)/html $(distdir)/doc/html</div><div> </div><div>-distclean-local:</div><div>+distclean-local: sphinx-clean</div><div>+sphinx-clean:</div><div> <span class="" style="white-space:pre"> </span>rm -rf $(BUILDDIR)</div><div> </div><div>-include/params.rst: $(top_builddir)/bin/varnishd/varnishd</div><div>-<span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishd/varnishd -x dumprstparam > include/params.rst</div><div>-BUILT_SOURCES = include/params.rst</div><div>+doc/sphinx/include:</div><div>+<span class="" style="white-space:pre"> </span>test -d $@ || mkdir -m0755 $@</div><div>+</div><div>+SPHINXFIRSTS = $(top_builddir)/lib/libvarnishapi/vsl-tags.rst</div><div>+</div><div>+$(top_builddir)/doc/sphinx/include/params.rst: $(top_builddir)/bin/varnishd/varnishd $(top_builddir)/doc/sphinx/include</div><div>+<span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishd/varnishd -x dumprstparam > $@</div><div>+SPHINXFIRSTS += $(top_builddir)/doc/sphinx/include/params.rst</div><div> </div><div> # XXX add varnishstat here when it's been _opt2rst'ed</div><div> </div><div>-include/varnishncsa_options.rst: $(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst</div><div>+$(top_builddir)/doc/sphinx/include/varnishncsa_options.rst: $(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst options > $@</div><div>-include/varnishncsa_synopsis.rst: $(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst</div><div>+$(top_builddir)/doc/sphinx/include/varnishncsa_synopsis.rst: $(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst synopsis > $@</div><div>-BUILT_SOURCES += include/varnishncsa_options.rst \</div><div>-<span class="" style="white-space:pre"> </span>include/varnishncsa_synopsis.rst</div><div>+SPHINXFIRSTS += $(top_builddir)/doc/sphinx/include/varnishncsa_options.rst \</div><div>+<span class="" style="white-space:pre"> </span>$(top_builddir)/doc/sphinx/include/varnishncsa_synopsis.rst</div><div> </div><div>-include/varnishlog_options.rst: $(top_builddir)/bin/varnishlog/varnishlog_opt2rst</div><div>+$(top_builddir)/doc/sphinx/include/varnishlog_options.rst: $(top_builddir)/bin/varnishlog/varnishlog_opt2rst</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishlog/varnishlog_opt2rst options > $@</div><div>-include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog_opt2rst</div><div>+$(top_builddir)/doc/sphinx/include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog_opt2rst</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishlog/varnishlog_opt2rst synopsis > $@</div><div>-BUILT_SOURCES += include/varnishlog_options.rst \</div><div>-<span class="" style="white-space:pre"> </span>include/varnishlog_synopsis.rst</div><div>+SPHINXFIRSTS += $(top_builddir)/doc/sphinx/include/varnishlog_options.rst \</div><div>+<span class="" style="white-space:pre"> </span>$(top_builddir)/doc/sphinx/include/varnishlog_synopsis.rst</div><div> </div><div>-include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst</div><div>+$(top_builddir)/doc/sphinx/include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishtop/varnishtop_opt2rst options > $@</div><div>-include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst</div><div>+$(top_builddir)/doc/sphinx/include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishtop/varnishtop_opt2rst synopsis > $@</div><div>-BUILT_SOURCES += include/varnishtop_options.rst \</div><div>-<span class="" style="white-space:pre"> </span> include/varnishtop_synopsis.rst</div><div>+SPHINXFIRSTS += $(top_builddir)/doc/sphinx/include/varnishtop_options.rst \</div><div>+<span class="" style="white-space:pre"> </span> $(top_builddir)/doc/sphinx/include/varnishtop_synopsis.rst</div><div> </div><div>-include/varnishhist_options.rst: $(top_builddir)/bin/varnishhist/varnishhist_opt2rst</div><div>+$(top_builddir)/doc/sphinx/include/varnishhist_options.rst: $(top_builddir)/bin/varnishhist/varnishhist_opt2rst</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishhist/varnishhist_opt2rst options > $@</div><div>-include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist_opt2rst</div><div>+$(top_builddir)/doc/sphinx/include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist_opt2rst</div><div> <span class="" style="white-space:pre"> </span>$(top_builddir)/bin/varnishhist/varnishhist_opt2rst synopsis > $@</div><div>-BUILT_SOURCES += include/varnishhist_options.rst \</div><div>-<span class="" style="white-space:pre"> </span> include/varnishhist_synopsis.rst</div><div>-</div><div>-.PHONY: reference</div><div>-reference:</div><div>-<span class="" style="white-space:pre"> </span>test -d $@ || mkdir $@</div><div>-BUILT_SOURCES += reference</div><div>-</div><div>-reference/vmod_std.generated.rst: reference $(top_builddir)/lib/libvmod_std/vmod_std.rst</div><div>-<span class="" style="white-space:pre"> </span>cp $(top_builddir)/lib/libvmod_std/vmod_std.rst $@</div><div>-BUILT_SOURCES += reference/vmod_std.generated.rst</div><div>-</div><div>-reference/vmod_directors.generated.rst: reference $(top_builddir)/lib/libvmod_directors/vmod_directors.rst</div><div>-<span class="" style="white-space:pre"> </span>cp $(top_builddir)/lib/libvmod_directors/vmod_directors.rst $@</div><div>-BUILT_SOURCES += reference/vmod_directors.generated.rst</div><div>-</div><div>-EXTRA_DIST += $(BUILT_SOURCES)</div><div>-MAINTAINERCLEANFILES = $(EXTRA_DIST)</div><div>+SPHINXFIRSTS += $(top_builddir)/doc/sphinx/include/varnishhist_options.rst \</div><div>+<span class="" style="white-space:pre"> </span> $(top_builddir)/doc/sphinx/include/varnishhist_synopsis.rst</div><div>+</div><div>+$(top_builddir)/doc/sphinx/reference/vmod_std.generated.rst: \</div><div>+<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvmod_std/vmod_std.rst</div><div>+<span class="" style="white-space:pre"> </span>mkdir -p $(top_builddir)/doc/sphinx/reference</div><div>+<span class="" style="white-space:pre"> </span>cp -f $(top_builddir)/lib/libvmod_std/vmod_std.rst $@</div><div>+SPHINXFIRSTS += $(top_builddir)/doc/sphinx/reference/vmod_std.generated.rst</div><div>+</div><div>+$(top_builddir)/doc/sphinx/reference/vmod_directors.generated.rst: \</div><div>+<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvmod_directors/vmod_directors.rst </div><div>+<span class="" style="white-space:pre"> </span>mkdir -p $(top_builddir)/doc/sphinx/reference</div><div>+<span class="" style="white-space:pre"> </span>cp -f $(top_builddir)/lib/libvmod_directors/vmod_directors.rst $@</div><div>+SPHINXFIRSTS += $(top_builddir)/doc/sphinx/reference/vmod_directors.generated.rst</div><div>+</div><div>+sphinx_prereq: $(SPHINXFIRSTS)</div><div>+</div><div>+$(SPHINXFIRSTS): doc/sphinx/include</div><div>+</div><div>+EXTRA_DIST += $(SPHINXFIRSTS) \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/directors.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/index.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/states.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/varnishadm.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/varnish-cli.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/varnishd.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/varnishhist.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/varnishlog.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/varnishncsa.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/varnishstat.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/varnishtest.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/varnishtop.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/vcl.rst \</div><div>+<span class="" style="white-space:pre"> </span> $(top_builddir)/doc/sphinx/reference/vmod_directors.generated.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/vmod.rst \</div><div>+<span class="" style="white-space:pre"> </span> $(top_builddir)/doc/sphinx/reference/vmod_std.generated.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/vsl-query.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/vsl.rst \</div><div>+<span class="" style="white-space:pre"> </span> doc/sphinx/reference/vsm.rst</div><div>+MAINTAINERCLEANFILES += $(SPHINXFIRSTS)</div><div>diff --git a/etc/Makefile.am b/etc/Makefile.am</div><div>index d02d710..5efeec6 100644</div><div>--- a/etc/Makefile.am</div><div>+++ b/etc/Makefile.am</div><div>@@ -1,12 +1,12 @@</div><div> #</div><div> </div><div>-DISTCLEANFILES = builtin.vcl</div><div>+DISTCLEANFILES += etc/builtin.vcl</div><div> </div><div>-dist_doc_DATA = builtin.vcl \</div><div>-<span class="" style="white-space:pre"> </span>example.vcl</div><div>+dist_doc_DATA = etc/builtin.vcl \</div><div>+<span class="" style="white-space:pre"> </span>etc/example.vcl</div><div> </div><div>-builtin.vcl:<span class="" style="white-space:pre"> </span>$(top_srcdir)/bin/varnishd/builtin.vcl</div><div>+etc/builtin.vcl:<span class="" style="white-space:pre"> </span>bin/varnishd/builtin.vcl</div><div> <span class="" style="white-space:pre"> </span>( printf "This is the VCL configuration Varnish will automatically append to your VCL\nfile during compilation/loading. See the vcl(7) man page for details on syntax\nand semantics.\n\</div><div> New users is recommended to use the example.vcl file as a starting point.\n\n";\</div><div>-<span class="" style="white-space:pre"> </span>sed -n '/vcl_recv/,$$p' $(top_srcdir)/bin/varnishd/builtin.vcl ) | \</div><div>-<span class="" style="white-space:pre"> </span>sed 's/^\(.*\)$$/# \1/' > builtin.vcl</div><div>+<span class="" style="white-space:pre"> </span>sed -n '/vcl_recv/,$$p' bin/varnishd/builtin.vcl ) | \</div><div>+<span class="" style="white-space:pre"> </span>sed 's/^\(.*\)$$/# \1/' > etc/builtin.vcl</div><div>diff --git a/include/Makefile.am b/include/Makefile.am</div><div>index 7088579..c615ede 100644</div><div>--- a/include/Makefile.am</div><div>+++ b/include/Makefile.am</div><div>@@ -1,109 +1,141 @@</div><div> #</div><div> </div><div> # API headers</div><div>-nobase_pkginclude_HEADERS = \</div><div>-<span class="" style="white-space:pre"> </span>tbl/acct_fields_req.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/acct_fields_bereq.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/backend_poll.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/ban_vars.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/bo_flags.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/body_status.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/debug_bits.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/feature_bits.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/http_headers.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/http_response.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/locks.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/obj_attr.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/params.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/req_body.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/req_flags.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/sess_attr.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/sess_close.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/steps.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/symbol_kind.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vcc_types.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vcl_returns.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vrt_stv_var.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vsc_types.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vsc_all.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vsc_fields.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vsc_levels.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vsc_f_main.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vsl_tags.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vsl_tags_http.h \</div><div>-<span class="" style="white-space:pre"> </span>vapi/vsm.h \</div><div>-<span class="" style="white-space:pre"> </span>vapi/vsm_int.h \</div><div>-<span class="" style="white-space:pre"> </span>vapi/vsc.h \</div><div>-<span class="" style="white-space:pre"> </span>vapi/vsc_int.h \</div><div>-<span class="" style="white-space:pre"> </span>vapi/vsl.h \</div><div>-<span class="" style="white-space:pre"> </span>vapi/vsl_int.h \</div><div>-<span class="" style="white-space:pre"> </span>vapi/voptget.h \</div><div>-<span class="" style="white-space:pre"> </span>vapi/vapi_options.h \</div><div>-<span class="" style="white-space:pre"> </span>vcli.h</div><div>+</div><div>+public_include_headers = \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/acct_fields_req.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/acct_fields_bereq.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/backend_poll.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/ban_vars.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/bo_flags.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/body_status.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/debug_bits.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/feature_bits.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/http_headers.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/http_response.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/locks.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/obj_attr.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/params.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/req_body.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/req_flags.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/sess_attr.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/sess_close.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/steps.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/symbol_kind.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vcc_types.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vcl_returns.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vrt_stv_var.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vsc_types.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vsc_all.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vsc_fields.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vsc_levels.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vsc_f_main.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vsl_tags.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vsl_tags_http.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vapi/vsm.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vapi/vsm_int.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vapi/vsc.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vapi/vsc_int.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vapi/vsl.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vapi/vsl_int.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vapi/voptget.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vapi/vapi_options.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vcli.h</div><div>+</div><div>+# This saddens me, but nobase will strip the path completely</div><div>+# and we want to keep everything after 'include/'</div><div>+# XXX one mkdir per file is wasteful, but we won't risk</div><div>+# forgetting subdirs</div><div>+install-data-local: install-public-include-headers</div><div>+install-public-include-headers:</div><div>+<span class="" style="white-space:pre"> </span>for i in $(public_include_headers); do \</div><div>+<span class="" style="white-space:pre"> </span>h_dir="$$(dirname $(DESTDIR)$(includedir)/varnish`echo $$i | sed s@include@@`)"; \</div><div>+<span class="" style="white-space:pre"> </span>$(install_sh) -d -m 0755 $$h_dir; \</div><div>+<span class="" style="white-space:pre"> </span>$(INSTALL_HEADER) $(srcdir)/$$i $$h_dir; \</div><div>+<span class="" style="white-space:pre"> </span>done</div><div>+</div><div>+#<span class="" style="white-space:pre"> </span>chmod +w $$(dirname $(includedir)/`echo $$i |</div><div>+#<span class="" style="white-space:pre"> </span>sed s@include@varnish@`);</div><div>+uninstall-hook: uninstall-public-include-headers </div><div>+uninstall-public-include-headers :</div><div>+<span class="" style="white-space:pre"> </span>for i in $(public_include_headers); do \</div><div>+<span class="" style="white-space:pre"> </span>rm -f $(DESTDIR)$(includedir)/`echo $$i | sed s@include@varnish@`; \</div><div>+<span class="" style="white-space:pre"> </span>done</div><div>+<span class="" style="white-space:pre"> </span></div><div>+.PHONY : install-public-include-headers uninstall-public-include-headers</div><div>+EXTRA_DIST += $(public_include_headers)</div><div> </div><div> # Headers for use with vmods</div><div>-nobase_pkginclude_HEADERS += \</div><div>-<span class="" style="white-space:pre"> </span>miniobj.h \</div><div>-<span class="" style="white-space:pre"> </span>vas.h \</div><div>-<span class="" style="white-space:pre"> </span>vav.h \</div><div>-<span class="" style="white-space:pre"> </span>vbm.h \</div><div>-<span class="" style="white-space:pre"> </span>vcl.h \</div><div>-<span class="" style="white-space:pre"> </span>vcs.h \</div><div>-<span class="" style="white-space:pre"> </span>vmod_abi.h \</div><div>-<span class="" style="white-space:pre"> </span>vqueue.h \</div><div>-<span class="" style="white-space:pre"> </span>vre.h \</div><div>-<span class="" style="white-space:pre"> </span>vdef.h \</div><div>-<span class="" style="white-space:pre"> </span>vrt.h \</div><div>-<span class="" style="white-space:pre"> </span>vrt_obj.h \</div><div>-<span class="" style="white-space:pre"> </span>vsa.h \</div><div>-<span class="" style="white-space:pre"> </span>vsb.h \</div><div>-<span class="" style="white-space:pre"> </span>vsha256.h \</div><div>-<span class="" style="white-space:pre"> </span>vtcp.h \</div><div>-<span class="" style="white-space:pre"> </span>vtim.h</div><div>+pkginclude_HEADERS += \</div><div>+<span class="" style="white-space:pre"> </span>include/miniobj.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vas.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vav.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vbm.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vcl.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vcs.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vmod_abi.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vqueue.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vre.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vdef.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vrt.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vrt_obj.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vsa.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vsb.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vsha256.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vtcp.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vtim.h</div><div> </div><div> # Private headers</div><div>-nobase_noinst_HEADERS = \</div><div>-<span class="" style="white-space:pre"> </span>binary_heap.h \</div><div>-<span class="" style="white-space:pre"> </span>compat/daemon.h \</div><div>-<span class="" style="white-space:pre"> </span>compat/execinfo.h \</div><div>-<span class="" style="white-space:pre"> </span>flopen.h \</div><div>-<span class="" style="white-space:pre"> </span>libvcc.h \</div><div>-<span class="" style="white-space:pre"> </span>vcli_common.h \</div><div>-<span class="" style="white-space:pre"> </span>vcli_priv.h \</div><div>-<span class="" style="white-space:pre"> </span>vcli_serve.h \</div><div>-<span class="" style="white-space:pre"> </span>vcs_version.h \</div><div>-<span class="" style="white-space:pre"> </span>vct.h \</div><div>-<span class="" style="white-space:pre"> </span>vcurses.h \</div><div>-<span class="" style="white-space:pre"> </span>vend.h \</div><div>-<span class="" style="white-space:pre"> </span>vev.h \</div><div>-<span class="" style="white-space:pre"> </span>vfil.h \</div><div>-<span class="" style="white-space:pre"> </span>vin.h \</div><div>-<span class="" style="white-space:pre"> </span>vlu.h \</div><div>-<span class="" style="white-space:pre"> </span>vmb.h \</div><div>-<span class="" style="white-space:pre"> </span>vnum.h \</div><div>-<span class="" style="white-space:pre"> </span>vpf.h \</div><div>-<span class="" style="white-space:pre"> </span>vrnd.h \</div><div>-<span class="" style="white-space:pre"> </span>vsl_priv.h \</div><div>-<span class="" style="white-space:pre"> </span>vsm_priv.h \</div><div>-<span class="" style="white-space:pre"> </span>vsub.h \</div><div>-<span class="" style="white-space:pre"> </span>vss.h \</div><div>-<span class="" style="white-space:pre"> </span>vtcp.h \</div><div>-<span class="" style="white-space:pre"> </span>vtree.h \</div><div>-<span class="" style="white-space:pre"> </span>vut.h \</div><div>-<span class="" style="white-space:pre"> </span>vut_options.h</div><div>+nobase_noinst_HEADERS += \</div><div>+<span class="" style="white-space:pre"> </span>include/binary_heap.h \</div><div>+<span class="" style="white-space:pre"> </span>include/compat/daemon.h \</div><div>+<span class="" style="white-space:pre"> </span>include/compat/execinfo.h \</div><div>+<span class="" style="white-space:pre"> </span>include/flopen.h \</div><div>+<span class="" style="white-space:pre"> </span>include/libvcc.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vcli_common.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vcli_priv.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vcli_serve.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vcs_version.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vct.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vcurses.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vend.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vev.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vfil.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vin.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vlu.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vmb.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vnum.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vpf.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vrnd.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vsl_priv.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vsm_priv.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vsub.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vss.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vtcp.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vtree.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vut.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vut_options.h</div><div>+</div><div>+include/tbl/vrt_stv_var.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vcl_returns.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vcc_types.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vrt_obj.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_fixed_token.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_obj.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_token_defs.h: \</div><div>+<span class="" style="white-space:pre"> </span>include/vcl.h</div><div>+include/vcl.h: lib/libvcc/generate.py include/vrt.h </div><div>+<span class="" style="white-space:pre"> </span>mkdir -p include/tbl</div><div>+<span class="" style="white-space:pre"> </span>@PYTHON@ $(top_srcdir)/lib/libvcc/generate.py . .</div><div> </div><div>-tbl/vrt_stv_var.h tbl/vcl_returns.h tbl/vcc_types.h vrt_obj.h: vcl.h</div><div>-vcl.h: $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir)/include/vrt.h</div><div>-<span class="" style="white-space:pre"> </span>mkdir -p tbl</div><div>-<span class="" style="white-space:pre"> </span>@PYTHON@ $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir) $(top_builddir)</div><div>+MAINTAINERCLEANFILES += $(top_builddir)/include/vcs_version.h</div><div> </div><div>-BUILT_SOURCES = vcs_version.h vmod_abi.h</div><div>-MAINTAINERCLEANFILES = vcs_version.h </div><div>-vcs_version.h: FORCE</div><div>+include/vcs_version.h:</div><div>+<span class="" style="white-space:pre"> </span>@mkdir -p include</div><div> <span class="" style="white-space:pre"> </span>@if [ -d "$(top_srcdir)/.git" ]; then \</div><div> <span class="" style="white-space:pre"> </span>V="$$(git show -s --pretty=format:%h)" \</div><div> <span class="" style="white-space:pre"> </span>B="$$(git rev-parse --abbrev-ref HEAD)" \</div><div>-<span class="" style="white-space:pre"> </span>H="$$(head -n 1 vcs_version.h 2>/dev/null || true)"; \</div><div>+<span class="" style="white-space:pre"> </span>H="$$(head -n 1 include/vcs_version.h 2>/dev/null || true)"; \</div><div> <span class="" style="white-space:pre"> </span>if [ "/* $$V */" != "$$H" ]; then \</div><div> <span class="" style="white-space:pre"> </span>( \</div><div> <span class="" style="white-space:pre"> </span> echo "/* $$V */" ;\</div><div>@@ -117,16 +149,16 @@ vcs_version.h: FORCE</div><div> <span class="" style="white-space:pre"> </span> echo '' ;\</div><div> <span class="" style="white-space:pre"> </span> echo "#define VCS_Version \"$$V\"" ; \</div><div> <span class="" style="white-space:pre"> </span> echo "#define VCS_Branch \"$$B\"" \</div><div>-<span class="" style="white-space:pre"> </span>) > vcs_version.h ; \</div><div>+<span class="" style="white-space:pre"> </span>) > include/vcs_version.h ; \</div><div> <span class="" style="white-space:pre"> </span>fi \</div><div> <span class="" style="white-space:pre"> </span>else \</div><div>-<span class="" style="white-space:pre"> </span>if [ ! -f vcs_version.h ]; then \</div><div>+<span class="" style="white-space:pre"> </span>if [ ! -f include/vcs_version.h ]; then \</div><div> <span class="" style="white-space:pre"> </span>( \</div><div> <span class="" style="white-space:pre"> </span> echo "/* NOGIT */" ; \</div><div> <span class="" style="white-space:pre"> </span> echo '/* No git commit ID available, see include/Makefile.am for explanation */' ; \</div><div> <span class="" style="white-space:pre"> </span> echo '#define VCS_Version "NOGIT"' ; \</div><div> <span class="" style="white-space:pre"> </span> echo '#define VCS_Branch "NOGIT"' \</div><div>-<span class="" style="white-space:pre"> </span>) > vcs_version.h ; \</div><div>+<span class="" style="white-space:pre"> </span>) > include/vcs_version.h ; \</div><div> <span class="" style="white-space:pre"> </span>fi \</div><div> <span class="" style="white-space:pre"> </span>fi</div><div> FORCE:</div><div>@@ -139,16 +171,16 @@ FORCE:</div><div> # The way to fix this is to either build Varnish from a tarball made</div><div> # with `make dist` or a git checkout.</div><div> </div><div>-vmod_abi.h: vcs_version.h</div><div>-<span class="" style="white-space:pre"> </span>@GITID=$$(sed 's/[^0-9a-f]//g;q' vcs_version.h) ; \</div><div>+include/vmod_abi.h: include/vcs_version.h</div><div>+<span class="" style="white-space:pre"> </span>@GITID=$$(sed 's/[^0-9a-f]//g;q' include/vcs_version.h) ; \</div><div> <span class="" style="white-space:pre"> </span>if [ -z "$$GITID" ]; then \</div><div> <span class="" style="white-space:pre"> </span>echo "warning: weak VMOD ABI checking, see include/Makefile.am" ; \</div><div> <span class="" style="white-space:pre"> </span>fi ; \</div><div>-<span class="" style="white-space:pre"> </span>echo "#define VMOD_ABI_Version \"@PACKAGE_STRING@ $$GITID\"" > vmod_abi.h</div><div>+<span class="" style="white-space:pre"> </span>echo "#define VMOD_ABI_Version \"@PACKAGE_STRING@ $$GITID\"" > $(top_builddir)/include/vmod_abi.h</div><div> </div><div>-CLEANFILES = \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vcl_returns.h \</div><div>-<span class="" style="white-space:pre"> </span>tbl/vrt_stv_var.h \</div><div>-<span class="" style="white-space:pre"> </span>vcl.h \</div><div>-<span class="" style="white-space:pre"> </span>vrt_obj.h \</div><div>-<span class="" style="white-space:pre"> </span>vmod_abi.h</div><div>+CLEANFILES += \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vcl_returns.h \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vrt_stv_var.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vcl.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vrt_obj.h \</div><div>+<span class="" style="white-space:pre"> </span>include/vmod_abi.h</div><div>diff --git a/lib/Makefile.am b/lib/Makefile.am</div><div>deleted file mode 100644</div><div>index c0c0e60..0000000</div><div>--- a/lib/Makefile.am</div><div>+++ /dev/null</div><div>@@ -1,23 +0,0 @@</div><div>-#</div><div>-</div><div>-SUBDIRS = \</div><div>-<span class="" style="white-space:pre"> </span>libvarnishcompat \</div><div>-<span class="" style="white-space:pre"> </span>libvarnish \</div><div>-<span class="" style="white-space:pre"> </span>libvarnishapi \</div><div>-<span class="" style="white-space:pre"> </span>libvarnishtools \</div><div>-<span class="" style="white-space:pre"> </span>libvcc \</div><div>-<span class="" style="white-space:pre"> </span>libvgz \</div><div>-<span class="" style="white-space:pre"> </span>libvmod_debug \</div><div>-<span class="" style="white-space:pre"> </span>libvmod_std \</div><div>-<span class="" style="white-space:pre"> </span>libvmod_directors</div><div>-</div><div>-DIST_SUBDIRS = <span class="" style="white-space:pre"> </span>\</div><div>-<span class="" style="white-space:pre"> </span>libvarnishcompat \</div><div>-<span class="" style="white-space:pre"> </span>libvarnish \</div><div>-<span class="" style="white-space:pre"> </span>libvarnishapi \</div><div>-<span class="" style="white-space:pre"> </span>libvarnishtools \</div><div>-<span class="" style="white-space:pre"> </span>libvcc \</div><div>-<span class="" style="white-space:pre"> </span>libvgz \</div><div>-<span class="" style="white-space:pre"> </span>libvmod_debug \</div><div>-<span class="" style="white-space:pre"> </span>libvmod_std \</div><div>-<span class="" style="white-space:pre"> </span>libvmod_directors</div><div>diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am</div><div>index b592cff..f24b894 100644</div><div>--- a/lib/libvarnish/Makefile.am</div><div>+++ b/lib/libvarnish/Makefile.am</div><div>@@ -1,53 +1,56 @@</div><div>-AM_CPPFLAGS = \</div><div>+lib_libvarnish_libvarnish_la_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include \</div><div> <span class="" style="white-space:pre"> </span>@PCRE_CFLAGS@</div><div> </div><div>-AM_LDFLAGS = $(AM_LT_LDFLAGS)</div><div>-</div><div>-pkglib_LTLIBRARIES = <a href="http://libvarnish.la">libvarnish.la</a></div><div>-</div><div>-libvarnish_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version</div><div>-</div><div>-libvarnish_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vav.c \</div><div>-<span class="" style="white-space:pre"> </span>vas.c \</div><div>-<span class="" style="white-space:pre"> </span>binary_heap.c \</div><div>-<span class="" style="white-space:pre"> </span>vsub.c \</div><div>-<span class="" style="white-space:pre"> </span>cli_auth.c \</div><div>-<span class="" style="white-space:pre"> </span>cli_common.c \</div><div>-<span class="" style="white-space:pre"> </span>cli_serve.c \</div><div>-<span class="" style="white-space:pre"> </span>flopen.c \</div><div>-<span class="" style="white-space:pre"> </span>vnum.c \</div><div>-<span class="" style="white-space:pre"> </span>vtim.c \</div><div>-<span class="" style="white-space:pre"> </span>vtcp.c \</div><div>-<span class="" style="white-space:pre"> </span>vct.c \</div><div>-<span class="" style="white-space:pre"> </span>version.c \</div><div>-<span class="" style="white-space:pre"> </span>vev.c \</div><div>-<span class="" style="white-space:pre"> </span>vfil.c \</div><div>-<span class="" style="white-space:pre"> </span>vin.c \</div><div>-<span class="" style="white-space:pre"> </span>vlu.c \</div><div>-<span class="" style="white-space:pre"> </span>vmb.c \</div><div>-<span class="" style="white-space:pre"> </span>vpf.c \</div><div>-<span class="" style="white-space:pre"> </span>vre.c \</div><div>-<span class="" style="white-space:pre"> </span>vrnd.c \</div><div>-<span class="" style="white-space:pre"> </span>vsa.c \</div><div>-<span class="" style="white-space:pre"> </span>vsb.c \</div><div>-<span class="" style="white-space:pre"> </span>vsha256.c \</div><div>-<span class="" style="white-space:pre"> </span>vss.c</div><div>-</div><div>-libvarnish_la_CFLAGS = -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'</div><div>-libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} @PCRE_LIBS@</div><div>+pkglib_LTLIBRARIES += lib/libvarnish/<a href="http://libvarnish.la">libvarnish.la</a></div><div>+</div><div>+lib_libvarnish_libvarnish_la_LDFLAGS = $(AM_LT_LDFLAGS) -avoid-version</div><div>+</div><div>+lib_libvarnish_libvarnish_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vav.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vas.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/binary_heap.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsub.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/cli_auth.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/cli_common.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/cli_serve.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/flopen.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vnum.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vtim.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vtcp.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vct.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/version.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vev.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vfil.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vin.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vlu.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vmb.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vpf.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vre.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vrnd.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsa.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsb.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsha256.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vss.c</div><div>+</div><div>+lib_libvarnish_libvarnish_la_CFLAGS = -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'</div><div>+lib_libvarnish_libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} @PCRE_LIBS@</div><div> </div><div> if ENABLE_TESTS</div><div>-TESTS = vnum_c_test</div><div>+TESTS += lib/libvarnish/vnum_c_test</div><div> </div><div>-noinst_PROGRAMS = ${TESTS}</div><div>+noinst_PROGRAMS += lib/libvarnish/vnum_c_test</div><div> </div><div>-vnum_c_test_SOURCES = vnum.c vas.c</div><div>-vnum_c_test_CFLAGS = -DNUM_C_TEST -include config.h</div><div>-vnum_c_test_LDADD = ${LIBM}</div><div>+lib_libvarnish_vnum_c_test_CPPFLAGS = \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include \</div><div>+<span class="" style="white-space:pre"> </span>@PCRE_CFLAGS@</div><div>+</div><div>+lib_libvarnish_vnum_c_test_SOURCES = lib/libvarnish/vnum.c lib/libvarnish/vas.c</div><div>+lib_libvarnish_vnum_c_test_CFLAGS = -DNUM_C_TEST -include config.h</div><div>+lib_libvarnish_vnum_c_test_LDADD = ${LIBM}</div><div> </div><div>-test: ${TESTS}</div><div>+test: lib/libvarnish/vnum_c_test</div><div> <span class="" style="white-space:pre"> </span>@for test in ${TESTS} ; do ./$${test} ; done</div><div> endif</div><div>diff --git a/lib/libvarnishapi/Makefile.am b/lib/libvarnishapi/Makefile.am</div><div>index 68a89bd..5e00829 100644</div><div>--- a/lib/libvarnishapi/Makefile.am</div><div>+++ b/lib/libvarnishapi/Makefile.am</div><div>@@ -1,105 +1,113 @@</div><div> #</div><div> </div><div>-AM_LDFLAGS = $(AM_LT_LDFLAGS)</div><div>-</div><div>-AM_CPPFLAGS = \</div><div>+lib_libvarnishapi_libvarnishapi_la_CPPFLAGS = \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/lib/libvarnishapi \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include \</div><div> <span class="" style="white-space:pre"> </span>@PCRE_CFLAGS@</div><div> </div><div>-lib_LTLIBRARIES = <a href="http://libvarnishapi.la">libvarnishapi.la</a></div><div>+lib_LTLIBRARIES += lib/libvarnishapi/<a href="http://libvarnishapi.la">libvarnishapi.la</a></div><div> </div><div>-libvarnishapi_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0</div><div>+lib_libvarnishapi_libvarnishapi_la_LDFLAGS = $(AM_LT_LDFLAGS) -version-info 1:0:0</div><div> </div><div>-libvarnishapi_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vsm_api.h \</div><div>-<span class="" style="white-space:pre"> </span>vsl_api.h \</div><div>-<span class="" style="white-space:pre"> </span>vxp.h \</div><div>-<span class="" style="white-space:pre"> </span>vxp_tokens.h \</div><div>+lib_libvarnishapi_libvarnishapi_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsm_api.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl_api.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vxp.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vxp_tokens.h \</div><div>+<span class="" style="white-space:pre"> </span>\</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vas.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vav.c \</div><div>+<span class="" style="white-space:pre"> </span>include/vcs_version.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/version.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/cli_common.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/cli_auth.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vin.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vmb.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vre.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsb.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vtim.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vnum.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnish/vsha256.c \</div><div> <span class="" style="white-space:pre"> </span>\</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/vas.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/vav.c \</div><div>-<span class="" style="white-space:pre"> </span>../../include/vcs_version.h \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/version.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/cli_common.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/cli_auth.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/vin.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/vmb.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/vre.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/vsb.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/vtim.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/vnum.c \</div><div>-<span class="" style="white-space:pre"> </span>../libvarnish/vsha256.c \</div><div>-<span class="" style="white-space:pre"> </span>vsm.c \</div><div>-<span class="" style="white-space:pre"> </span>vsl_arg.c \</div><div>-<span class="" style="white-space:pre"> </span>vsl_cursor.c \</div><div>-<span class="" style="white-space:pre"> </span>vsl_dispatch.c \</div><div>-<span class="" style="white-space:pre"> </span>vsl_query.c \</div><div>-<span class="" style="white-space:pre"> </span>vsl.c \</div><div>-<span class="" style="white-space:pre"> </span>vsc.c \</div><div>-<span class="" style="white-space:pre"> </span>vxp.c \</div><div>-<span class="" style="white-space:pre"> </span>vxp_parse.c \</div><div>-<span class="" style="white-space:pre"> </span>vxp_lexer.c \</div><div>-<span class="" style="white-space:pre"> </span>vxp_fixed_token.c \</div><div>-<span class="" style="white-space:pre"> </span>libvarnishapi.map</div><div>-</div><div>-libvarnishapi_la_CFLAGS = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vxp_fixed_token.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsm.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl_arg.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl_cursor.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl_dispatch.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl_query.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsc.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vxp.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vxp_parse.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vxp_lexer.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/libvarnishapi.map</div><div>+</div><div>+lib/libvarnish/lib_libvarnish_libvarnish_la-version.lo FORCE: include/vcs_version.h</div><div>+</div><div>+lib_libvarnishapi_libvarnishapi_la_CFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'</div><div> </div><div>-libvarnishapi_la_LIBADD = @PCRE_LIBS@ @RT_LIBS@</div><div>+lib_libvarnishapi_libvarnishapi_la_LIBADD = @PCRE_LIBS@ @RT_LIBS@</div><div> </div><div> if HAVE_LD_VERSION_SCRIPT</div><div>-libvarnishapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libvarnishapi.map</div><div>+lib_libvarnishapi_libvarnishapi_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/lib/libvarnishapi/libvarnishapi.map</div><div> else</div><div>-libvarnishapi_la_LDFLAGS += -export-symbols-regex '^V'</div><div>+lib_libvarnishapi_libvarnishapi_la_LDFLAGS += -export-symbols-regex '^V'</div><div> endif</div><div> </div><div>-EXTRA_DIST = \</div><div>-<span class="" style="white-space:pre"> </span>generate.py \</div><div>-<span class="" style="white-space:pre"> </span>vsl-tags.rst</div><div>+EXTRA_DIST += \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/generate.py \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl-tags.rst</div><div> </div><div>-BUILT_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vxp_fixed_token.c \</div><div>-<span class="" style="white-space:pre"> </span>vxp_tokens.h \</div><div>-<span class="" style="white-space:pre"> </span>vsl-tags.rst</div><div>+#BUILT_SOURCES += \</div><div>+#<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vxp_fixed_token.c \</div><div>+#<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vxp_tokens.h</div><div> </div><div>-CLEANFILES = \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vxp_fixed_token.c \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vxp_tokens.h</div><div>+CLEANFILES += \</div><div>+<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/vxp_fixed_token.c \</div><div>+<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvarnishapi/vxp_tokens.h</div><div> </div><div>-MAINTAINERCLEANFILES = \</div><div>-<span class="" style="white-space:pre"> </span>vsl-tags.rst</div><div>+MAINTAINERCLEANFILES += \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl-tags.rst</div><div> </div><div>-noinst_PROGRAMS = vsl2rst</div><div>+noinst_PROGRAMS += lib/libvarnishapi/vsl2rst</div><div> </div><div>-vsl2rst_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vsl2rst.c \</div><div>+lib_libvarnishapi_vsl2rst_CPPFLAGS = \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include \</div><div>+<span class="" style="white-space:pre"> </span>@PCRE_CFLAGS@</div><div>+</div><div>+lib_libvarnishapi_vsl2rst_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl2rst.c \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/include/tbl/vsl_tags.h \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/include/tbl/vsl_tags_http.h</div><div> </div><div>-vsl-tags.rst: vsl2rst</div><div>-<span class="" style="white-space:pre"> </span>./vsl2rst > $@</div><div>+$(top_builddir)/lib/libvarnishapi/vsl-tags.rst: lib/libvarnishapi/vsl2rst</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl2rst > lib/libvarnishapi/vsl-tags.rst</div><div>+</div><div>+lib/libvarnishapi/vxp_fixed_token.c : lib/libvarnishapi/vxp_tokens.h</div><div> </div><div>-vxp_fixed_token.c vxp_tokens.h: \</div><div>-<span class="" style="white-space:pre"> </span>$(srcdir)/generate.py</div><div>-<span class="" style="white-space:pre"> </span>@PYTHON@ $(srcdir)/generate.py $(srcdir) $(top_builddir)</div><div>+lib/libvarnishapi/vxp_tokens.h: \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/generate.py</div><div>+<span class="" style="white-space:pre"> </span>@PYTHON@ $(top_srcdir)/lib/libvarnishapi/generate.py lib/libvarnishapi/ .</div><div> </div><div>-EXTRA_PROGRAMS = vxp_test vsl_glob_test</div><div>+EXTRA_PROGRAMS = lib/libvarnishapi/vxp_test lib/libvarnishapi/vsl_glob_test</div><div> </div><div>-vxp_test_LDADD = @PCRE_LIBS@ \</div><div>+lib_libvarnishapi_vxp_test_LDADD = @PCRE_LIBS@ \</div><div> <span class="" style="white-space:pre"> </span>${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}</div><div> </div><div>-vxp_test_CFLAGS = \</div><div>+lib_libvarnishapi_vxp_test_CFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \</div><div> <span class="" style="white-space:pre"> </span>-DVXP_DEBUG</div><div> </div><div>-vxp_test_SOURCES = \</div><div>+lib_libvarnishapi_vxp_test_SOURCES = \</div><div> <span class="" style="white-space:pre"> </span>$(libvarnishapi_la_SOURCES) \</div><div>-<span class="" style="white-space:pre"> </span>vxp_test.c</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vxp_test.c</div><div> </div><div>-vsl_glob_test_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vsl_glob_test.c</div><div>+lib_libvarnishapi_vsl_glob_test_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishapi/vsl_glob_test.c</div><div> </div><div>-vsl_glob_test_LDADD = @PCRE_LIBS@ ${RT_LIBS} ${LIBM} <a href="http://libvarnishapi.la">libvarnishapi.la</a></div><div>+lib_libvarnishapi_vsl_glob_test_LDADD = @PCRE_LIBS@ ${RT_LIBS} ${LIBM} <a href="http://libvarnishapi.la">libvarnishapi.la</a></div><div> </div><div>-vsl_glob_test_CFLAGS = -I$(top_srcdir)/include</div><div>+lib_libvarnishapi_vsl_glob_test_CFLAGS = -I$(top_srcdir)/include</div><div>diff --git a/lib/libvarnishcompat/Makefile.am b/lib/libvarnishcompat/Makefile.am</div><div>index 78683c0..120e955 100644</div><div>--- a/lib/libvarnishcompat/Makefile.am</div><div>+++ b/lib/libvarnishcompat/Makefile.am</div><div>@@ -1,15 +1,13 @@</div><div> #</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+lib_libvarnishcompat_libvarnishcompat_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-AM_LDFLAGS = $(AM_LT_LDFLAGS)</div><div>+pkglib_LTLIBRARIES += lib/libvarnishcompat/<a href="http://libvarnishcompat.la">libvarnishcompat.la</a></div><div> </div><div>-pkglib_LTLIBRARIES = <a href="http://libvarnishcompat.la">libvarnishcompat.la</a></div><div>+lib_libvarnishcompat_libvarnishcompat_la_LDFLAGS = $(AM_LT_LDFLAGS) -avoid-version</div><div> </div><div>-libvarnishcompat_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version</div><div>-</div><div>-libvarnishcompat_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>daemon.c \</div><div>-<span class="" style="white-space:pre"> </span>execinfo.c</div><div>+lib_libvarnishcompat_libvarnishcompat_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishcompat/daemon.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishcompat/execinfo.c</div><div>diff --git a/lib/libvarnishtools/Makefile.am b/lib/libvarnishtools/Makefile.am</div><div>index 1a14212..910b6ff 100644</div><div>--- a/lib/libvarnishtools/Makefile.am</div><div>+++ b/lib/libvarnishtools/Makefile.am</div><div>@@ -1,5 +1,5 @@</div><div> #</div><div> </div><div>-EXTRA_DIST = \</div><div>-<span class="" style="white-space:pre"> </span>vut.c \</div><div>-<span class="" style="white-space:pre"> </span>opt2rst.c</div><div>+EXTRA_DIST += \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/vut.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvarnishtools/opt2rst.c</div><div>diff --git a/lib/libvcc/Makefile.am b/lib/libvcc/Makefile.am</div><div>index b5a6574..d49d55a 100644</div><div>--- a/lib/libvcc/Makefile.am</div><div>+++ b/lib/libvcc/Makefile.am</div><div>@@ -1,45 +1,46 @@</div><div> #</div><div> </div><div>-AM_LDFLAGS = $(AM_LT_LDFLAGS)</div><div>-</div><div>-AM_CPPFLAGS = \</div><div>+lib_libvcc_libvcc_la_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div> </div><div>-pkglib_LTLIBRARIES = <a href="http://libvcc.la">libvcc.la</a></div><div>+pkglib_LTLIBRARIES += lib/libvcc/<a href="http://libvcc.la">libvcc.la</a></div><div> </div><div>-libvcc_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version</div><div>+lib_libvcc_libvcc_la_LDFLAGS = $(AM__LT_LDFLAGS) -avoid-version</div><div> </div><div>-libvcc_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vcc_compile.h \</div><div>-<span class="" style="white-space:pre"> </span>vcc_token_defs.h \</div><div>+lib_libvcc_libvcc_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_compile.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_token_defs.h \</div><div> <span class="" style="white-space:pre"> </span>\</div><div>-<span class="" style="white-space:pre"> </span>vcc_acl.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_action.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_backend.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_backend_util.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_compile.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_expr.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_parse.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_fixed_token.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_obj.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_storage.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_utils.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_symb.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_token.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_var.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_vmod.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_xref.c</div><div>-</div><div>-EXTRA_DIST = \</div><div>-<span class="" style="white-space:pre"> </span>generate.py</div><div>-</div><div>-dist_pkgdata_SCRIPTS = \</div><div>-<span class="" style="white-space:pre"> </span>vmodtool.py</div><div>-</div><div>-vcc_obj.c vcc_fixed_token.c vcc_token_defs.h: \</div><div>-<span class="" style="white-space:pre"> </span>$(top_builddir)/include/vcl.h</div><div>-</div><div>-CLEANFILES = $(builddir)/vcc_token_defs.h \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vcc_fixed_token.c \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vcc_obj.c</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_acl.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_action.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_backend.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_backend_util.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_compile.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_expr.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_parse.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_fixed_token.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_obj.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_storage.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_utils.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_symb.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_token.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_var.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_vmod.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vcc_xref.c</div><div>+</div><div>+EXTRA_DIST += \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/generate.py</div><div>+</div><div>+dist_pkgdata_SCRIPTS += \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/vmodtool.py</div><div>+</div><div>+lib/libvcc/lib_libvcc_libvcc_la-vcc_vmod.lo FORCE: include/vmod_abi.h include/vcl.h</div><div>+</div><div>+lib/libvcc/lib_libvcc_libvcc_la-vcc_obj.$(OBJEXT) \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/lib_libvcc_libvcc_la-vcc_fixed_token.$(OBJEXT) \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvcc/lib_libvcc_libvcc_la-vcc_token_defs.$(OBJEXT) : include/vcl.h</div><div>+</div><div>+CLEANFILES += $(builddir)/lib/libvcc/vcc_token_defs.h \</div><div>+<span class="" style="white-space:pre"> </span>$(builddir)/lib/libvcc/vcc_fixed_token.c \</div><div>+<span class="" style="white-space:pre"> </span>$(builddir)/lib/libvcc/vcc_obj.c</div><div>diff --git a/lib/libvgz/Makefile.am b/lib/libvgz/Makefile.am</div><div>index d9c0dae..be7b9b2 100644</div><div>--- a/lib/libvgz/Makefile.am</div><div>+++ b/lib/libvgz/Makefile.am</div><div>@@ -1,31 +1,31 @@</div><div> #</div><div>-AM_LDFLAGS = $(AM_LT_LDFLAGS)</div><div>+pkglib_LTLIBRARIES += lib/libvgz/<a href="http://libvgz.la">libvgz.la</a></div><div> </div><div>-pkglib_LTLIBRARIES = <a href="http://libvgz.la">libvgz.la</a></div><div>+lib_libvgz_libvgz_la_LDFLAGS = $(AM__LTLDFLAGS) -avoid-version</div><div>+lib_libvgz_libvgz_la_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST $(libvgz_extra_cflags)</div><div> </div><div>-libvgz_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version</div><div>-libvgz_la_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST $(libvgz_extra_cflags)</div><div>+lib_libvgz_libvgz_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/adler32.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/compress.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/crc32.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/crc32.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/deflate.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/deflate.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/gzguts.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/infback.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/inffast.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/inffast.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/inffixed.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/inflate.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/inflate.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/inftrees.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/inftrees.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/trees.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/trees.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/uncompr.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/zconf.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/vgz.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/zutil.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvgz/zutil.h</div><div> </div><div>-libvgz_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>adler32.c \</div><div>-<span class="" style="white-space:pre"> </span>compress.c \</div><div>-<span class="" style="white-space:pre"> </span>crc32.c \</div><div>-<span class="" style="white-space:pre"> </span>crc32.h \</div><div>-<span class="" style="white-space:pre"> </span>deflate.c \</div><div>-<span class="" style="white-space:pre"> </span>deflate.h \</div><div>-<span class="" style="white-space:pre"> </span>gzguts.h \</div><div>-<span class="" style="white-space:pre"> </span>infback.c \</div><div>-<span class="" style="white-space:pre"> </span>inffast.c \</div><div>-<span class="" style="white-space:pre"> </span>inffast.h \</div><div>-<span class="" style="white-space:pre"> </span>inffixed.h \</div><div>-<span class="" style="white-space:pre"> </span>inflate.c \</div><div>-<span class="" style="white-space:pre"> </span>inflate.h \</div><div>-<span class="" style="white-space:pre"> </span>inftrees.c \</div><div>-<span class="" style="white-space:pre"> </span>inftrees.h \</div><div>-<span class="" style="white-space:pre"> </span>trees.c \</div><div>-<span class="" style="white-space:pre"> </span>trees.h \</div><div>-<span class="" style="white-space:pre"> </span>uncompr.c \</div><div>-<span class="" style="white-space:pre"> </span>zconf.h \</div><div>-<span class="" style="white-space:pre"> </span>vgz.h \</div><div>-<span class="" style="white-space:pre"> </span>zutil.c \</div><div>-<span class="" style="white-space:pre"> </span>zutil.h</div><div>+EXTRA_DIST += lib/libvgz/README</div><div>diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am</div><div>index 9115713..1c8d02a 100644</div><div>--- a/lib/libvmod_debug/Makefile.am</div><div>+++ b/lib/libvmod_debug/Makefile.am</div><div>@@ -1,37 +1,38 @@</div><div> #</div><div>-AM_LDFLAGS = $(AM_LT_LDFLAGS)</div><div> </div><div>-AM_CPPFLAGS = \</div><div>+</div><div>+lib_libvmod_debug_libvmod_debug_la_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishd \</div><div>-<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/lib/libvmod_debug</div><div> </div><div>-vmoddir = $(pkglibdir)/vmods</div><div>-vmod_srcdir = $(top_srcdir)/lib/libvmod_debug</div><div>-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py</div><div>-vmodtoolargs = --strict</div><div>+noinst_LTLIBRARIES += lib/libvmod_debug/<a href="http://libvmod_debug.la">libvmod_debug.la</a></div><div> </div><div>-noinst_LTLIBRARIES = <a href="http://libvmod_debug.la">libvmod_debug.la</a></div><div>+lib_libvmod_debug_libvmod_debug_la_LDFLAGS = $(AM_LT_LDFLAGS) -module -export-dynamic -avoid-version -shared -rpath $(abs_builddir)</div><div> </div><div>-libvmod_debug_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared -rpath /nowhere</div><div>+lib_libvmod_debug_libvmod_debug_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_debug/vmod_debug.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_debug/vmod_debug_obj.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_debug/vmod_debug_dyn.c</div><div> </div><div>-libvmod_debug_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vmod_debug.c \</div><div>-<span class="" style="white-space:pre"> </span>vmod_debug_obj.c \</div><div>-<span class="" style="white-space:pre"> </span>vmod_debug_dyn.c</div><div>+nodist_lib_libvmod_debug_libvmod_debug_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_debug/vcc_if.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_debug/vcc_if.h</div><div> </div><div>-nodist_libvmod_debug_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vcc_if.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_if.h</div><div>+$(lib_libvmod_debug_libvmod_debug_la_OBJECTS) : lib/libvmod_debug/vcc_if.h include/tbl/vcl_returns.h</div><div> </div><div>-# BUILT_SOURCES is only a hack and dependency tracking does not help for the first build</div><div>-vmod_debug.lo vmod_debug_obj.lo vmod_debug_dyn.lo: vcc_if.h</div><div>+# stupid hack to run vmodtool only once</div><div>+lib/libvmod_debug/vcc_if.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_debug/vmod_debug.rst \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_debug/vmod_debug.man.rst : lib/libvmod_debug/vcc_if.h</div><div>+<span class="" style="white-space:pre"> </span>@#</div><div> </div><div>-vcc_if.c vcc_if.h vmod_debug.rst vmod_debug.man.rst: $(vmodtool) $(vmod_srcdir)/vmod.vcc</div><div>-<span class="" style="white-space:pre"> </span>@PYTHON@ $(vmodtool) $(vmodtoolargs) $(vmod_srcdir)/vmod.vcc</div><div>+lib/libvmod_debug/vcc_if.h: $(vmodtool) lib/libvmod_debug/vmod.vcc</div><div>+<span class="" style="white-space:pre"> </span>cd lib/libvmod_debug/ && @PYTHON@ ../../$(vmodtool) $(vmodtoolargs) $(abs_top_srcdir)/lib/libvmod_debug/vmod.vcc</div><div> </div><div>-EXTRA_DIST = vmod.vcc</div><div>+EXTRA_DIST += lib/libvmod_debug/vmod.vcc</div><div> </div><div>-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vmod_debug.rst \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vmod_debug.man.rst</div><div>+CLEANFILES += $(builddir)/lib/libvmod_debug/vcc_if.c $(builddir)/lib/libvmod_debug/vcc_if.h \</div><div>+<span class="" style="white-space:pre"> </span>$(builddir)/lib/libvmod_debug/vmod_debug.rst \</div><div>+<span class="" style="white-space:pre"> </span>$(builddir)/lib/libvmod_debug/vmod_debug.man.rst</div><div>diff --git a/lib/libvmod_directors/Makefile.am b/lib/libvmod_directors/Makefile.am</div><div>index 64b72a8..f2465d8 100644</div><div>--- a/lib/libvmod_directors/Makefile.am</div><div>+++ b/lib/libvmod_directors/Makefile.am</div><div>@@ -1,40 +1,41 @@</div><div> #</div><div>-AM_LDFLAGS = $(AM_LT_LDFLAGS)</div><div>-</div><div>-AM_CPPFLAGS = \</div><div>+lib_libvmod_directors_libvmod_directors_la_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishd \</div><div>-<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/lib/libvmod_directors</div><div>+</div><div>+vmod_LTLIBRARIES += lib/libvmod_directors/<a href="http://libvmod_directors.la">libvmod_directors.la</a></div><div> </div><div>-vmoddir = $(pkglibdir)/vmods</div><div>-vmod_srcdir = $(top_srcdir)/lib/libvmod_directors</div><div>-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py</div><div>-vmodtoolargs = --strict</div><div>-vmod_LTLIBRARIES = <a href="http://libvmod_directors.la">libvmod_directors.la</a></div><div>+lib_libvmod_directors_libvmod_directors_la_LDFLAGS = $(AM_LT_LDFLAGS) -module -export-dynamic -avoid-version -shared</div><div> </div><div>-libvmod_directors_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared</div><div>+lib_libvmod_directors_libvmod_directors_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/vdir.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/vdir.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/fall_back.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/hash.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/random.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/round_robin.c</div><div> </div><div>-libvmod_directors_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vdir.c \</div><div>-<span class="" style="white-space:pre"> </span>vdir.h \</div><div>-<span class="" style="white-space:pre"> </span>fall_back.c \</div><div>-<span class="" style="white-space:pre"> </span>hash.c \</div><div>-<span class="" style="white-space:pre"> </span>random.c \</div><div>-<span class="" style="white-space:pre"> </span>round_robin.c</div><div>+nodist_lib_libvmod_directors_libvmod_directors_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/vcc_if.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/vcc_if.h</div><div> </div><div>-nodist_libvmod_directors_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vcc_if.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_if.h</div><div>+lib/libvmod_std/lib_libvmod_std_libvmod_std_la-vmod_vcc_if.lo : include/vmod_abi.h</div><div> </div><div>-# BUILT_SOURCES is only a hack and dependency tracking does not help for the first build</div><div>-vdir.lo fall_back.lo hash.lo random.lo round_robin.lo: vcc_if.h</div><div>+$(lib_libvmod_directors_libvmod_directors_la_OBJECTS) : lib/libvmod_directors/vcc_if.h include/tbl/vcl_returns.h</div><div> </div><div>-vcc_if.c vcc_if.h vmod_directors.rst vmod_directors.man.rst: $(vmodtool) $(vmod_srcdir)/vmod.vcc</div><div>-<span class="" style="white-space:pre"> </span>@PYTHON@ $(vmodtool) $(vmodtoolargs) $(vmod_srcdir)/vmod.vcc</div><div>+# stupid hack to run vmodtool only once</div><div>+lib/libvmod_directors/vcc_if.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/vmod_directors.rst \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_directors/vmod_directors.man.rst : lib/libvmod_directors/vcc_if.h</div><div>+<span class="" style="white-space:pre"> </span>@#</div><div> </div><div>+lib/libvmod_directors/vcc_if.h: $(vmodtool) lib/libvmod_directors/vmod.vcc</div><div>+<span class="" style="white-space:pre"> </span>cd lib/libvmod_directors/ && @PYTHON@ ../../$(vmodtool) $(vmodtoolargs) $(abs_top_srcdir)/lib/libvmod_directors/vmod.vcc</div><div> </div><div>-EXTRA_DIST = vmod.vcc</div><div>+EXTRA_DIST += lib/libvmod_directors/vmod.vcc</div><div> </div><div>-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vmod_directors.rst \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vmod_directors.man.rst</div><div>+CLEANFILES += $(top_builddir)/lib/libvmod_directors/vcc_if.c $(top_builddir)/lib/libvmod_directors/vcc_if.h \</div><div>+<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvmod_directors/vmod_directors.rst \</div><div>+<span class="" style="white-space:pre"> </span>$(top_builddir)/lib/libvmod_directors/vmod_directors.man.rst</div><div>diff --git a/lib/libvmod_std/Makefile.am b/lib/libvmod_std/Makefile.am</div><div>index 47dd5dc..1cb5636 100644</div><div>--- a/lib/libvmod_std/Makefile.am</div><div>+++ b/lib/libvmod_std/Makefile.am</div><div>@@ -1,38 +1,41 @@</div><div> #</div><div> </div><div>-AM_LDFLAGS = $(AM_LT_LDFLAGS)</div><div>-</div><div>-AM_CPPFLAGS = \</div><div>+lib_libvmod_std_libvmod_std_la_CPPFLAGS = \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/include \</div><div> <span class="" style="white-space:pre"> </span>-I$(top_srcdir)/bin/varnishd \</div><div>-<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/include \</div><div>+<span class="" style="white-space:pre"> </span>-I$(top_builddir)/lib/libvmod_std</div><div>+</div><div>+vmod_LTLIBRARIES += lib/libvmod_std/<a href="http://libvmod_std.la">libvmod_std.la</a></div><div>+</div><div>+lib_libvmod_std_libvmod_std_la_LDFLAGS = $(AM_LT_LDFLAGS) -module -export-dynamic -avoid-version -shared</div><div> </div><div>-vmoddir = $(pkglibdir)/vmods</div><div>-vmod_srcdir = $(top_srcdir)/lib/libvmod_std</div><div>-vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py</div><div>-vmodtoolargs = --strict</div><div>-vmod_LTLIBRARIES = <a href="http://libvmod_std.la">libvmod_std.la</a></div><div>+lib_libvmod_std_libvmod_std_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vmod_std.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vmod_std_conversions.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vmod_std_fileread.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vmod_std_querysort.c</div><div> </div><div>-libvmod_std_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared</div><div>+nodist_lib_libvmod_std_libvmod_std_la_SOURCES = \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vcc_if.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vcc_if.h</div><div> </div><div>-libvmod_std_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vmod_std.c \</div><div>-<span class="" style="white-space:pre"> </span>vmod_std_conversions.c \</div><div>-<span class="" style="white-space:pre"> </span>vmod_std_fileread.c \</div><div>-<span class="" style="white-space:pre"> </span>vmod_std_querysort.c</div><div>+lib/libvmod_std/lib_libvmod_std_libvmod_std_la-vmod_vcc_if.$(OBJEXT) : include/vmod_abi.h</div><div> </div><div>-nodist_libvmod_std_la_SOURCES = \</div><div>-<span class="" style="white-space:pre"> </span>vcc_if.c \</div><div>-<span class="" style="white-space:pre"> </span>vcc_if.h</div><div>+$(lib_libvmod_std_libvmod_std_la_OBJECTS) : lib/libvmod_std/vcc_if.h include/tbl/vcl_returns.h</div><div> </div><div>-# BUILT_SOURCES is only a hack and dependency tracking does not help for the first build</div><div>-$(libvmod_std_la_OBJECTS): vcc_if.h</div><div>+# stupid hack to run vmodtool only once</div><div>+lib/libvmod_std/vcc_if.c \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vmod_std.rst \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vmod_std.man.rst : lib/libvmod_std/vcc_if.h</div><div>+<span class="" style="white-space:pre"> </span>@#</div><div> </div><div>-vcc_if.c vcc_if.h vmod_std.rst vmod_std.man.rst: $(vmodtool) $(vmod_srcdir)/vmod.vcc</div><div>-<span class="" style="white-space:pre"> </span>@PYTHON@ $(vmodtool) $(vmodtoolargs) $(vmod_srcdir)/vmod.vcc</div><div>+lib/libvmod_std/vcc_if.h: $(vmodtool) lib/libvmod_std/vmod.vcc</div><div>+<span class="" style="white-space:pre"> </span>cd lib/libvmod_std/ && @PYTHON@ ../../$(vmodtool) $(vmodtoolargs) $(abs_top_srcdir)/lib/libvmod_std/vmod.vcc</div><div> </div><div>-EXTRA_DIST = vmod.vcc</div><div>+EXTRA_DIST += lib/libvmod_std/vmod.vcc</div><div> </div><div>-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vmod_std.rst \</div><div>-<span class="" style="white-space:pre"> </span>$(builddir)/vmod_std.man.rst</div><div>+CLEANFILES += lib/libvmod_std/vcc_if.c lib/libvmod_std/vcc_if.h \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vmod_std.rst \</div><div>+<span class="" style="white-space:pre"> </span>lib/libvmod_std/vmod_std.man.rst</div><div>+<span class="" style="white-space:pre"> </span></div><div>diff --git a/man/Makefile.am b/man/Makefile.am</div><div>index d791d1f..5ad9f48 100644</div><div>--- a/man/Makefile.am</div><div>+++ b/man/Makefile.am</div><div>@@ -1,93 +1,91 @@</div><div> #</div><div> </div><div>-noinst_PROGRAMS = vsc2rst</div><div>-vsc2rst_SOURCES = vsc2rst.c \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/include/tbl/vsc_fields.h</div><div>+noinst_PROGRAMS += man/vsc2rst</div><div>+man_vsc2rst_SOURCES = man/vsc2rst.c \</div><div>+<span class="" style="white-space:pre"> </span>include/tbl/vsc_fields.h</div><div> </div><div>-AM_CPPFLAGS = -I$(top_srcdir)/include</div><div>+man_vsc2rst_CPPFLAGS = -I$(top_srcdir)/include</div><div> </div><div> dist_man_MANS = \</div><div>-<span class="" style="white-space:pre"> </span>varnish-cli.7 \</div><div>-<span class="" style="white-space:pre"> </span>varnish-counters.7 \</div><div>-<span class="" style="white-space:pre"> </span>vcl.7 \</div><div>-<span class="" style="white-space:pre"> </span>vsl.7 \</div><div>-<span class="" style="white-space:pre"> </span>vsl-query.7 \</div><div>-<span class="" style="white-space:pre"> </span>varnishadm.1 \</div><div>-<span class="" style="white-space:pre"> </span>varnishd.1 \</div><div>-<span class="" style="white-space:pre"> </span>varnishhist.1 \</div><div>-<span class="" style="white-space:pre"> </span>varnishlog.1 \</div><div>-<span class="" style="white-space:pre"> </span>varnishncsa.1 \</div><div>-<span class="" style="white-space:pre"> </span>varnishstat.1 \</div><div>-<span class="" style="white-space:pre"> </span>varnishtest.1 \</div><div>-<span class="" style="white-space:pre"> </span>varnishtop.1 \</div><div>-<span class="" style="white-space:pre"> </span>vmod_directors.3 \</div><div>-<span class="" style="white-space:pre"> </span>vmod_std.3</div><div>-</div><div>-MAINTAINERCLEANFILES = $(dist_man_MANS)</div><div>-</div><div>-RST2ANY_FLAGS = --halt=2</div><div>-</div><div>-varnish-cli.7: $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst</div><div>+<span class="" style="white-space:pre"> </span>man/varnish-cli.7 \</div><div>+<span class="" style="white-space:pre"> </span>man/varnish-counters.7 \</div><div>+<span class="" style="white-space:pre"> </span>man/vcl.7 \</div><div>+<span class="" style="white-space:pre"> </span>man/vsl.7 \</div><div>+<span class="" style="white-space:pre"> </span>man/vsl-query.7 \</div><div>+<span class="" style="white-space:pre"> </span>man/varnishadm.1 \</div><div>+<span class="" style="white-space:pre"> </span>man/varnishd.1 \</div><div>+<span class="" style="white-space:pre"> </span>man/varnishhist.1 \</div><div>+<span class="" style="white-space:pre"> </span>man/varnishlog.1 \</div><div>+<span class="" style="white-space:pre"> </span>man/varnishncsa.1 \</div><div>+<span class="" style="white-space:pre"> </span>man/varnishstat.1 \</div><div>+<span class="" style="white-space:pre"> </span>man/varnishtest.1 \</div><div>+<span class="" style="white-space:pre"> </span>man/varnishtop.1 \</div><div>+<span class="" style="white-space:pre"> </span>man/vmod_directors.3 \</div><div>+<span class="" style="white-space:pre"> </span>man/vmod_std.3</div><div>+</div><div>+MAINTAINERCLEANFILES += $(dist_man_MANS)</div><div>+</div><div>+man/varnish-cli.7: $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst $@</div><div> </div><div>-varnish-counters.7: vsc2rst</div><div>-<span class="" style="white-space:pre"> </span>./vsc2rst | ${RST2MAN} $(RST2ANY_FLAGS) - $@</div><div>+man/varnish-counters.7: $(top_builddir)/man/vsc2rst</div><div>+<span class="" style="white-space:pre"> </span>$^ | ${RST2MAN} $(RST2ANY_FLAGS) - $@</div><div> </div><div>-vcl.7: $(top_srcdir)/doc/sphinx/reference/vcl.rst \</div><div>-<span class="" style="white-space:pre"> </span>$(top_srcdir)/bin/varnishd/builtin.vcl</div><div>+man/vcl.7: $(top_srcdir)/doc/sphinx/reference/vcl.rst \</div><div>+<span class="" style="white-space:pre"> </span>bin/varnishd/builtin.vcl</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/vcl.rst $@</div><div> </div><div>-vsl.7: $(top_srcdir)/doc/sphinx/reference/vsl.rst \</div><div>+man/vsl.7: $(top_srcdir)/doc/sphinx/reference/vsl.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/lib/libvarnishapi/vsl-tags.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/vsl.rst $@</div><div> </div><div>-vsl-query.7: $(top_srcdir)/doc/sphinx/reference/vsl-query.rst</div><div>+man/vsl-query.7: $(top_srcdir)/doc/sphinx/reference/vsl-query.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/vsl-query.rst $@</div><div> </div><div>-varnishadm.1: $(top_srcdir)/doc/sphinx/reference/varnishadm.rst</div><div>+man/varnishadm.1: $(top_srcdir)/doc/sphinx/reference/varnishadm.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishadm.rst $@</div><div> </div><div>-varnishd.1: \</div><div>+man/varnishd.1: \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/reference/varnishd.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/include/params.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishd.rst $@</div><div> </div><div>-varnishncsa.1: \</div><div>+man/varnishncsa.1: \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/reference/varnishncsa.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/include/varnishncsa_options.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/include/varnishncsa_synopsis.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishncsa.rst $@</div><div> </div><div>-varnishlog.1: \</div><div>+man/varnishlog.1: \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/reference/varnishlog.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/include/varnishlog_options.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/include/varnishlog_synopsis.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishlog.rst $@</div><div> </div><div>-varnishreplay.1: $(top_srcdir)/doc/sphinx/reference/varnishreplay.rst</div><div>+man/varnishreplay.1: $(top_srcdir)/doc/sphinx/reference/varnishreplay.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishreplay.rst $@</div><div> </div><div> # XXX add _options.rst and _synopsis.rst here when it's been _opt2rst'ed</div><div>-varnishstat.1: $(top_srcdir)/doc/sphinx/reference/varnishstat.rst</div><div>+man/varnishstat.1: $(top_srcdir)/doc/sphinx/reference/varnishstat.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishstat.rst $@</div><div> </div><div>-varnishtest.1: $(top_srcdir)/doc/sphinx/reference/varnishtest.rst</div><div>+man/varnishtest.1: $(top_srcdir)/doc/sphinx/reference/varnishtest.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishtest.rst $@</div><div> </div><div>-varnishtop.1: \</div><div>+man/varnishtop.1: \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/reference/varnishtop.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/include/varnishtop_options.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/include/varnishtop_synopsis.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishtop.rst $@</div><div> </div><div>-varnishhist.1: \</div><div>+man/varnishhist.1: \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/reference/varnishhist.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/include/varnishhist_options.rst \</div><div> <span class="" style="white-space:pre"> </span>$(top_srcdir)/doc/sphinx/include/varnishhist_synopsis.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishhist.rst $@</div><div> </div><div>-vmod_std.3: $(top_builddir)/lib/libvmod_std/vmod_std.man.rst</div><div>+man/vmod_std.3: $(top_builddir)/lib/libvmod_std/vmod_std.man.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $? $@</div><div> </div><div>-vmod_directors.3: $(top_builddir)/lib/libvmod_directors/vmod_directors.man.rst</div><div>+man/vmod_directors.3: $(top_builddir)/lib/libvmod_directors/vmod_directors.man.rst</div><div> <span class="" style="white-space:pre"> </span>${RST2MAN} $(RST2ANY_FLAGS) $? $@</div></div><div><br></div>
</div>