[master] 6ef598f Make this work with bsd make as well

Federico G. Schwindt fgsch at lodoss.net
Fri Feb 7 13:30:29 CET 2014


commit 6ef598f51fc80db676c1f84a754093141f371a4f
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Feb 7 12:23:01 2014 +0000

    Make this work with bsd make as well
    
    Avoid using gnu make specific rules. While here sort entries and add
    missing dep for varnishd.

diff --git a/man/Makefile.am b/man/Makefile.am
index 2b26b0b..50e9b64 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,9 +8,10 @@ vsc2rst_SOURCES = vsc2rst.c \
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-dist_man_MANS = vcl.7 \
+dist_man_MANS = \
 	varnish-cli.7 \
 	varnish-counters.7 \
+	vcl.7 \
 	vsl.7 \
 	vsl-query.7 \
 	varnishadm.1 \
@@ -24,16 +25,16 @@ dist_man_MANS = vcl.7 \
 
 MAINTAINERCLEANFILES = $(dist_man_MANS)
 
-vcl.7: $(top_srcdir)/doc/sphinx/reference/vcl.rst \
-	$(top_srcdir)/bin/varnishd/builtin.vcl
-	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/vcl.rst $@
-
 varnish-cli.7: $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst
 	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst $@
 
 varnish-counters.7: vsc2rst
 	./vsc2rst | ${RST2MAN} - $@
 
+vcl.7: $(top_srcdir)/doc/sphinx/reference/vcl.rst \
+	$(top_srcdir)/bin/varnishd/builtin.vcl
+	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/vcl.rst $@
+
 vsl.7: $(top_srcdir)/doc/sphinx/reference/vsl.rst \
 	$(top_srcdir)/lib/libvarnishapi/vsl-tags.rst
 	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/vsl.rst $@
@@ -41,11 +42,13 @@ vsl.7: $(top_srcdir)/doc/sphinx/reference/vsl.rst \
 vsl-query.7: $(top_srcdir)/doc/sphinx/reference/vsl-query.rst
 	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/vsl-query.rst $@
 
-%.7: $(top_srcdir)/doc/sphinx/reference/%.rst
-	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/vsl-query.rst $@
+varnishadm.1: $(top_srcdir)/doc/sphinx/reference/varnishadm.rst
+	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishadm.rst $@
 
-%.1: $(top_srcdir)/doc/sphinx/reference/%.rst
-	${RST2MAN} $< $@
+varnishd.1: \
+	$(top_srcdir)/doc/sphinx/reference/varnishd.rst \
+	$(top_srcdir)/doc/sphinx/include/params.rst
+	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishd.rst $@
 
 varnishncsa.1: \
 	$(top_srcdir)/doc/sphinx/reference/varnishncsa.rst \
@@ -59,6 +62,15 @@ varnishlog.1: \
 	$(top_srcdir)/doc/sphinx/include/varnishlog_synopsis.rst
 	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishlog.rst $@
 
+varnishreplay.1: $(top_srcdir)/doc/sphinx/reference/varnishreplay.rst
+	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishreplay.rst $@
+
+varnishstat.1: $(top_srcdir)/doc/sphinx/reference/varnishstat.rst
+	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishstat.rst $@
+
+varnishtest.1: $(top_srcdir)/doc/sphinx/reference/varnishtest.rst
+	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishtest.rst $@
+
 varnishtop.1: \
 	$(top_srcdir)/doc/sphinx/reference/varnishtop.rst \
 	$(top_srcdir)/doc/sphinx/include/varnishtop_options.rst \



More information about the varnish-commit mailing list