r5427 - in trunk/varnish-cache: . bin/varnishadm bin/varnishsizes doc doc/sphinx lib/libvarnish man
tfheen at varnish-cache.org
tfheen at varnish-cache.org
Wed Oct 13 10:24:27 CEST 2010
Author: tfheen
Date: 2010-10-13 10:24:27 +0200 (Wed, 13 Oct 2010)
New Revision: 5427
Added:
trunk/varnish-cache/doc/sphinx/Makefile.am
Removed:
trunk/varnish-cache/doc/sphinx/Makefile
Modified:
trunk/varnish-cache/bin/varnishadm/Makefile.am
trunk/varnish-cache/bin/varnishsizes/Makefile.am
trunk/varnish-cache/configure.ac
trunk/varnish-cache/doc/Makefile.am
trunk/varnish-cache/lib/libvarnish/Makefile.am
trunk/varnish-cache/man/Makefile.am
Log:
Documentation build system fixup
Fix up the documentation build system, hopefully making "make
distcheck" work correctly again.
Modified: trunk/varnish-cache/bin/varnishadm/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishadm/Makefile.am 2010-10-13 08:22:57 UTC (rev 5426)
+++ trunk/varnish-cache/bin/varnishadm/Makefile.am 2010-10-13 08:24:27 UTC (rev 5427)
@@ -4,9 +4,7 @@
bin_PROGRAMS = varnishadm
-if HAVE_RST2MAN
dist_man_MANS = varnishadm.1
-endif
varnishadm_SOURCES = \
varnishadm.c
@@ -17,7 +15,7 @@
$(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
Modified: trunk/varnish-cache/bin/varnishsizes/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishsizes/Makefile.am 2010-10-13 08:22:57 UTC (rev 5426)
+++ trunk/varnish-cache/bin/varnishsizes/Makefile.am 2010-10-13 08:24:27 UTC (rev 5427)
@@ -4,9 +4,7 @@
bin_PROGRAMS = varnishsizes
-if HAVE_RST2MAN
dist_man_MANS = varnishsizes.1
-endif
varnishsizes_SOURCES = varnishsizes.c
@@ -16,7 +14,7 @@
-lm \
${CURSES_LIBS} ${PTHREAD_LIBS}
-%.1: ../../doc/sphinx/reference/%.rst
+%.1: $(top_srcdir)/doc/sphinx/reference/%.rst
if HAVE_RST2MAN
${RST2MAN} $< >$@
else
Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac 2010-10-13 08:22:57 UTC (rev 5426)
+++ trunk/varnish-cache/configure.ac 2010-10-13 08:24:27 UTC (rev 5427)
@@ -455,6 +455,7 @@
bin/varnishtest/Makefile
bin/varnishtop/Makefile
doc/Makefile
+ doc/sphinx/Makefile
etc/Makefile
include/Makefile
lib/Makefile
Modified: trunk/varnish-cache/doc/Makefile.am
===================================================================
--- trunk/varnish-cache/doc/Makefile.am 2010-10-13 08:22:57 UTC (rev 5426)
+++ trunk/varnish-cache/doc/Makefile.am 2010-10-13 08:24:27 UTC (rev 5427)
@@ -34,8 +34,7 @@
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 @@
${CHANGELOGS}: changes-html.xsl
+SUBDIRS = sphinx
Deleted: trunk/varnish-cache/doc/sphinx/Makefile
===================================================================
--- trunk/varnish-cache/doc/sphinx/Makefile 2010-10-13 08:22:57 UTC (rev 5426)
+++ trunk/varnish-cache/doc/sphinx/Makefile 2010-10-13 08:24:27 UTC (rev 5427)
@@ -1,89 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS =
-SPHINXBUILD = sphinx-build
-PAPER =
-BUILDDIR = =build
-
-# Internal variables.
-PAPEROPT_a4 = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
-
-help:
- @echo "Please use \`make <target>' where <target> is one of"
- @echo " html to make standalone HTML files"
- @echo " dirhtml to make HTML files named index.html in directories"
- @echo " pickle to make pickle files"
- @echo " json to make JSON files"
- @echo " htmlhelp to make HTML files and a HTML help project"
- @echo " qthelp to make HTML files and a qthelp project"
- @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
- @echo " changes to make an overview of all changed/added/deprecated items"
- @echo " linkcheck to check all external links for integrity"
- @echo " doctest to run all doctests embedded in the documentation (if enabled)"
-
-clean:
- -rm -rf $(BUILDDIR)/*
-
-html:
- $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
- @echo
- @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
- $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
- @echo
- @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-pickle:
- $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
- @echo
- @echo "Build finished; now you can process the pickle files."
-
-json:
- $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
- @echo
- @echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
- $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
- @echo
- @echo "Build finished; now you can run HTML Help Workshop with the" \
- ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
- $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
- @echo
- @echo "Build finished; now you can run "qcollectiongenerator" with the" \
- ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
- @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Varnish.qhcp"
- @echo "To view the help file:"
- @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Varnish.qhc"
-
-latex:
- $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
- @echo
- @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
- @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
- "run these through (pdf)latex."
-
-changes:
- $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
- @echo
- @echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
- $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
- @echo
- @echo "Link check complete; look for any errors in the above output " \
- "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
- $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
- @echo "Testing of doctests in the sources finished, look at the " \
- "results in $(BUILDDIR)/doctest/output.txt."
Added: trunk/varnish-cache/doc/sphinx/Makefile.am
===================================================================
--- trunk/varnish-cache/doc/sphinx/Makefile.am (rev 0)
+++ trunk/varnish-cache/doc/sphinx/Makefile.am 2010-10-13 08:24:27 UTC (rev 5427)
@@ -0,0 +1,140 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER =
+BUILDDIR = =build
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+
+help:
+ @echo "Please use \`make <target>' where <target> is one of"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+ @echo " changes to make an overview of all changed/added/deprecated items"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+ -rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Varnish.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Varnish.qhc"
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+ "run these through (pdf)latex."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+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
Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am 2010-10-13 08:22:57 UTC (rev 5426)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am 2010-10-13 08:24:27 UTC (rev 5427)
@@ -4,7 +4,8 @@
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 \
Modified: trunk/varnish-cache/man/Makefile.am
===================================================================
--- trunk/varnish-cache/man/Makefile.am 2010-10-13 08:22:57 UTC (rev 5426)
+++ trunk/varnish-cache/man/Makefile.am 2010-10-13 08:24:27 UTC (rev 5427)
@@ -1,15 +1,9 @@
# $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
More information about the varnish-commit
mailing list