[master] 23baabd Get closer to distcheck working

[Poul-Henning Kamp]

commit 23baabde796dea577d09fa22c82e497f1af6624b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Oct 8 16:23:44 2011 +0000

    Get closer to distcheck working

diff --git a/.gitignore b/.gitignore
index f35e990..eb2db8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,9 +43,9 @@ TAGS
 
 # Various auto-generated code snippets
 /include/vcl.h
-/include/vcl_returns.h
+/include/tbl/vcl_returns.h
 /include/vrt_obj.h
-/include/vrt_stv_var.h
+/include/tbl/vrt_stv_var.h
 /include/vcs_version.h
 /lib/libvcl/vcc_fixed_token.c
 /lib/libvcl/vcc_obj.c
diff --git a/bin/flint.lnt b/bin/flint.lnt
index d2f7c0e..4ad63d1 100644
--- a/bin/flint.lnt
+++ b/bin/flint.lnt
@@ -9,8 +9,7 @@
 +libh ../../config.h
 -efile(451, ../../config.h)	// No include guard
 
--efile(451, vsl_tags.h)		// No include guard
--efile(451, vsc_fields.h)	// No include guard
+-efile(451, "tbl/*.h")		// No include guard
 
 ///////////////////////////////////////////////////////////////////////
 // assert() support, common to libvarnish and libvarnishapi
diff --git a/include/Makefile.am b/include/Makefile.am
index 652689b..9f317f4 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,7 +16,6 @@ pkginclude_HEADERS = \
 	vsm.h
 
 nobase_noinst_HEADERS = \
-	tbl/ban_vars.h \
 	binary_heap.h \
 	cli_common.h \
 	cli_priv.h \
@@ -25,36 +24,37 @@ nobase_noinst_HEADERS = \
 	compat/execinfo.h \
 	compat/srandomdev.h \
 	flopen.h \
-	tbl/http_headers.h \
-	tbl/http_response.h \
 	libvarnish.h \
 	libvcl.h \
 	miniobj.h \
 	persistent.h \
+	tbl/ban_vars.h \
+	tbl/http_headers.h \
+	tbl/http_response.h \
+	tbl/vcl_returns.h \
+	tbl/vrt_stv_var.h \
 	vas.h \
 	vav.h \
-	vsha256.h \
-	vqueue.h \
-	vpf.h \
-	vsb.h \
+	vbm.h \
 	vcl.h \
-	vcl_returns.h \
 	vcs_version.h \
 	vct.h \
 	vend.h \
 	vev.h \
 	vin.h \
 	vlu.h \
-	vbm.h \
 	vmb.h \
 	vmod_abi.h \
+	vpf.h \
+	vqueue.h \
 	vre.h \
 	vrt.h \
 	vrt_obj.h \
-	vrt_stv_var.h \
+	vsb.h \
+	vsha256.h \
 	vss.h
 
-vrt_stv_var.h vcl_returns.h vcl.h vrt_obj.h: $(top_srcdir)/lib/libvcl/generate.py $(top_srcdir)/include/vrt.h
+tbl/vrt_stv_var.h tbl/vcl_returns.h vcl.h vrt_obj.h: $(top_srcdir)/lib/libvcl/generate.py $(top_srcdir)/include/vrt.h
 	@PYTHON@ $(top_srcdir)/lib/libvcl/generate.py $(top_srcdir) $(top_builddir)
 
 BUILT_SOURCES = vcs_version.h vmod_abi.h
diff --git a/man/Makefile.am b/man/Makefile.am
index 9317896..9118c34 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -4,7 +4,7 @@ if HAVE_RST2MAN
 noinst_PROGRAMS = vsc2rst
 endif
 vsc2rst_SOURCES = vsc2rst.c \
-	$(top_srcdir)/include/vsc_fields.h
+	$(top_srcdir)/include/tbl/vsc_fields.h
 
 INCLUDES = -I$(top_srcdir)/include
 
@@ -36,7 +36,7 @@ if HAVE_RST2MAN
 varnish-counters.7: vsc2rst
 	./vsc2rst | ${RST2MAN} - $@
 else
-varnish-counters.7: $(top_srcdir)/include/vsc_fields.h
+varnish-counters.7: $(top_srcdir)/include/tbl/vsc_fields.h
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"
 	@echo "========================================"