Move varnish-counters man page.

To get this into the normal Sphinx build, move it to bin/varnishstat/
(where it feels like it belongs the most), and use our normal build flow for man
pages.

.gitignore

@@ -76,7 +76,6 @@ cscope.*out
 
 
 # Man-files and binaries
-/man/vsc2rst
 /man/*.1
 /man/*.3
 /man/*.7
@@ -90,6 +89,7 @@ cscope.*out
 /bin/varnishncsa/varnishncsa
 /bin/varnishreplay/varnishreplay
 /bin/varnishstat/varnishstat
+/bin/varnishstat/vsc2rst
 /bin/varnishtest/varnishtest
 /bin/varnishtop/varnishtop
 

bin/varnishstat/Makefile.am

@@ -19,3 +19,6 @@ varnishstat_LDADD = \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	@CURSES_LIB@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
+
+noinst_PROGRAMS = vsc2rst
+vsc2rst_SOURCES = vsc2rst.c $(top_srcdir)/include/tbl/vsc_fields.h

man/vsc2rst.c → bin/varnishstat/vsc2rst.c

@@ -47,21 +47,6 @@ int main(int argc, char **argv)
 {
 	(void)argc;
 	(void)argv;
-	P(".. _varnish-counters(7): ");
-	P("");
-	P("================");
-	P("varnish-counters");
-	P("================");
-	P("");
-
-	P("---------------------------------");
-	P("Varnish counter field definitions");
-	P("---------------------------------");
-	P("");
-
-	P(":Manual section: 7");
-	P("");
-
 	P("COUNTER LEVELS");
 	P("==============");
 	P("");
@@ -120,13 +105,5 @@ int main(int argc, char **argv)
 #include "tbl/vsc_fields.h"
 #undef VSC_DO_LCK
 
-	P("");
-	P("COPYRIGHT");
-	P("=========");
-	P("This document is licensed under the same licence as Varnish");
-	P("itself. See LICENCE for details.");
-	P("");
-	P("* Copyright (c) 2006 Verdens Gang AS");
-	P("* Copyright (c) 2006-2015 Varnish Software AS");
 	return (0);
 }

doc/sphinx/Makefile.am

@@ -128,6 +128,10 @@ include/params.rst: $(top_builddir)/bin/varnishd/varnishd
 	$(top_builddir)/bin/varnishd/varnishd -x dumprstparam > include/params.rst
 BUILT_SOURCES = include/params.rst
 
+include/counters.rst: $(top_builddir)/bin/varnishstat/vsc2rst
+	$(top_builddir)/bin/varnishstat/vsc2rst > $@
+BUILT_SOURCES += include/counters.rst
+
 # XXX add varnishstat here when it's been _opt2rst'ed
 
 include/varnishncsa_options.rst: $(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst

doc/sphinx/reference/index.rst

@@ -23,6 +23,7 @@ The Varnish Reference Manual
 	vmod_std.generated.rst
 	vmod_directors.generated.rst
 	directors.rst
+	varnish-counters.rst
 	vsl.rst
 	vsl-query.rst
 

doc/sphinx/reference/varnish-counters.rst

+.. _varnish-counters(7):
+
+================
+varnish-counters
+================
+
+---------------------------------
+Varnish counter field definitions
+---------------------------------
+
+:Manual section: 7
+
+
+.. include:: ../include/counters.rst
+
+
+AUTHORS
+=======
+
+This man page was written by Lasse Karstensen, using content from vsc2rst
+written by Tollef Fog Heen.

man/Makefile.am

 #
 
-noinst_PROGRAMS = vsc2rst
-vsc2rst_SOURCES = vsc2rst.c \
-	$(top_srcdir)/include/tbl/vsc_fields.h
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
 dist_man_MANS = \
 	varnish-cli.7 \
 	varnish-counters.7 \
@@ -30,8 +24,8 @@ RST2ANY_FLAGS = --halt=2
 varnish-cli.7: $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst
 	${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst $@
 
-varnish-counters.7: vsc2rst
-	./vsc2rst | ${RST2MAN} $(RST2ANY_FLAGS) - $@
+varnish-counters.7: $(top_srcdir)/doc/sphinx/reference/varnish-counters.rst
+	${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnish-counters.rst $@
 
 vcl.7: $(top_srcdir)/doc/sphinx/reference/vcl.rst \
 	$(top_srcdir)/bin/varnishd/builtin.vcl