[master] 2abb545 Build man from man/ and add params.rst to BUILT_OBJECTS

[Tollef Fog Heen]

commit 2abb545829d9a494360b020cd5efcf5cb2a0a07c
Author: Tollef Fog Heen <tfheen at fastly.com>
Date:   Wed Feb 5 13:14:16 2014 +0100

    Build man from man/ and add params.rst to BUILT_OBJECTS

diff --git a/Makefile.am b/Makefile.am
index 66c9e03..2eb3af4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include lib bin man etc doc
+SUBDIRS = include lib bin etc doc man
 
 SUBDIRS += redhat
 
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index e0a8461..8cd8cf5 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -8,8 +8,6 @@ AM_CPPFLAGS = \
 
 sbin_PROGRAMS = varnishd
 
-dist_man_MANS = varnishd.1
-
 varnishd_SOURCES = \
 	cache/cache_acceptor.c \
 	cache/cache_backend.c \
@@ -146,13 +144,3 @@ builtin_vcl.h:	builtin.vcl
 
 # Explicitly record dependency
 mgt/mgt_vcc.c:	builtin_vcl.h
-
-varnishd.1: $(top_srcdir)/doc/sphinx/reference/varnishd.rst
-if HAVE_RST2MAN
-	${RST2MAN} $? $@
-else
-	@echo "========================================"
-	@echo "You need rst2man installed to make dist"
-	@echo "========================================"
-	@false
-endif
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 692cf6f..df3d3c4 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -176,5 +176,8 @@ dist-hook:
 distclean-local:
 	rm -rf $(BUILDDIR)
 
-reference/params.rst:
+reference/params.rst: $(top_builddir)/bin/varnishd/varnishd
+	mkdir -p reference
 	$(top_builddir)/bin/varnishd/varnishd -x dumprstparam > reference/params.rst
+
+BUILT_SOURCES = reference/params.rst
diff --git a/man/Makefile.am b/man/Makefile.am
index 1ed3a5d..7d0b1f6 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,7 +8,7 @@ vsc2rst_SOURCES = vsc2rst.c \
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-dist_man_MANS = vcl.7 varnish-cli.7 varnish-counters.7 vsl.7 vsl-query.7
+dist_man_MANS = vcl.7 varnish-cli.7 varnish-counters.7 vsl.7 vsl-query.7 varnishd.1
 MAINTAINERCLEANFILES = $(dist_man_MANS)
 
 vcl.7: $(top_srcdir)/doc/sphinx/reference/vcl.rst \
@@ -63,3 +63,13 @@ else
 	@echo "========================================"
 	@false
 endif
+
+varnishd.1: $(top_srcdir)/doc/sphinx/reference/varnishd.rst
+if HAVE_RST2MAN
+	${RST2MAN} $^ $@
+else
+	@echo "========================================"
+	@echo "You need rst2man installed to make dist"
+	@echo "========================================"
+	@false
+endif