Documentation build system fixup

Fix up the documentation build system, hopefully making "make
distcheck" work correctly again.


git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5427 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishadm/Makefile.am

@@ -4,9 +4,7 @@ INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishadm
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishadm.1
-endif
 
 varnishadm_SOURCES = \
 	varnishadm.c
@@ -17,7 +15,7 @@ varnishadm_LDADD = \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	${PTHREAD_LIBS} ${NET_LIBS}
 
-%.1: ../../doc/sphinx/reference/%.rst
+%.1: $(top_srcdir)/doc/sphinx/reference/%.rst
 if HAVE_RST2MAN
 	${RST2MAN} $< >$@
 else

bin/varnishsizes/Makefile.am

@@ -4,9 +4,7 @@ INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishsizes
 
-if HAVE_RST2MAN
 dist_man_MANS = varnishsizes.1
-endif
 
 varnishsizes_SOURCES = varnishsizes.c
 
@@ -16,7 +14,7 @@ varnishsizes_LDADD = \
 	-lm \
 	${CURSES_LIBS} ${PTHREAD_LIBS}
 
-%.1: ../../doc/sphinx/reference/%.rst
+%.1: $(top_srcdir)/doc/sphinx/reference/%.rst
 if HAVE_RST2MAN
 	${RST2MAN} $< >$@
 else

configure.ac

@@ -455,6 +455,7 @@ AC_CONFIG_FILES([
     bin/varnishtest/Makefile
     bin/varnishtop/Makefile
     doc/Makefile
+    doc/sphinx/Makefile
     etc/Makefile
     include/Makefile
     lib/Makefile

doc/Makefile.am

@@ -34,8 +34,7 @@ all: ${CHANGELOGS}
 endif
 
 EXTRA_DIST = ${CHANGELOGS} ${XML} \
-	changes.css changes-html.xsl \
-	getting-started.html
+	changes.css changes-html.xsl
 
 CLEANFILES = ${CHANGELOGS}
 SUFFIXES = .xml .html
@@ -52,3 +51,4 @@ endif
 
 ${CHANGELOGS}: changes-html.xsl
 
+SUBDIRS = sphinx

doc/sphinx/Makefile → doc/sphinx/Makefile.am

@@ -87,3 +87,54 @@ doctest:
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
+
+EXTRA_DIST = \
+	conf.py \
+	index.rst \
+	faq/configuration.rst \
+	faq/general.rst \
+	faq/http.rst \
+	faq/index.rst \
+	faq/logging.rst \
+	glossary/index.rst \
+	installation/bugs.rst \
+	installation/help.rst \
+	installation/index.rst \
+	installation/install.rst \
+	installation/prerequisites.rst \
+	phk/autocrap.rst \
+	phk/backends.rst \
+	phk/barriers.rst \
+	phk/index.rst \
+	phk/ipv6suckage.rst \
+	phk/platforms.rst \
+	phk/sphinx.rst \
+	phk/thoughts.rst \
+	phk/vcl_expr.rst \
+	reference/index.rst \
+	reference/shmem.rst \
+	reference/varnishadm.rst \
+	reference/varnishd.rst \
+	reference/varnishhist.rst \
+	reference/varnishlog.rst \
+	reference/varnishncsa.rst \
+	reference/varnishreplay.rst \
+	reference/varnishsizes.rst \
+	reference/varnishstat.rst \
+	reference/varnishtest.rst \
+	reference/varnishtop.rst \
+	reference/vcl.rst \
+	reference/vmod.rst \
+	tutorial/advanced_backend_servers.rst \
+	tutorial/advanced_topics.rst \
+	tutorial/backend_servers.rst \
+	tutorial/handling_misbehaving_servers.rst \
+	tutorial/increasing_your_hitrate.rst \
+	tutorial/index.rst \
+	tutorial/logging.rst \
+	tutorial/putting_varnish_on_port_80.rst \
+	tutorial/sizing_your_cache.rst \
+	tutorial/starting_varnish.rst \
+	tutorial/statistics.rst \
+	tutorial/troubleshooting.rst \
+	tutorial/vcl.rst

lib/libvarnish/Makefile.am

@@ -4,7 +4,8 @@ INCLUDES = -I$(top_srcdir)/include @PCRE_CFLAGS@
 
 lib_LTLIBRARIES = libvarnish.la
 
-libvarnish_la_LDFLAGS = -version-info 1:0:0
+libvarnish_la_LDFLAGS = -version-info 1:0:0 \
+	../libvarnishcompat/libvarnishcompat.la
 
 libvarnish_la_SOURCES = \
 	argv.c \

man/Makefile.am

 # $Id$
 
-DISTCLEANFILES = vcl.7 default.vcl
-
-if HAVE_RST2MAN
 dist_man_MANS = vcl.7
-endif
-
-default.vcl:	$(top_srcdir)/bin/varnishd/default.vcl Makefile
-	sed -n '/vcl_recv/,$$p' $(top_srcdir)/bin/varnishd/default.vcl > $@
 
-vcl.7: ../doc/sphinx/reference/vcl.rst default.vcl
+vcl.7: $(top_srcdir)/doc/sphinx/reference/vcl.rst \
+	$(top_srcdir)/bin/varnishd/default.vcl
 if HAVE_RST2MAN
 	${RST2MAN} $< >$@
 else