r5485 - in trunk/varnish-cache/bin: varnishadm varnishd varnishhist varnishlog varnishncsa varnishreplay varnishsizes varnishstat varnishtest varnishtop

tfheen at varnish-cache.org tfheen at varnish-cache.org
Thu Oct 28 14:18:39 CEST 2010 

Author: tfheen
Date: 2010-10-28 14:18:39 +0200 (Thu, 28 Oct 2010)
New Revision: 5485

Modified:
   trunk/varnish-cache/bin/varnishadm/Makefile.am
   trunk/varnish-cache/bin/varnishd/Makefile.am
   trunk/varnish-cache/bin/varnishhist/Makefile.am
   trunk/varnish-cache/bin/varnishlog/Makefile.am
   trunk/varnish-cache/bin/varnishncsa/Makefile.am
   trunk/varnish-cache/bin/varnishreplay/Makefile.am
   trunk/varnish-cache/bin/varnishsizes/Makefile.am
   trunk/varnish-cache/bin/varnishstat/Makefile.am
   trunk/varnish-cache/bin/varnishtest/Makefile.am
   trunk/varnish-cache/bin/varnishtop/Makefile.am
Log:
Get rid of gmakeism in manual page generation

%-rules are a gmakeism, and similarly, it appears that GNU and BSD
make treat $< differently for target rules.  This commit should
hopefully make BSD make happier when it comes to make dist.


Modified: trunk/varnish-cache/bin/varnishadm/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishadm/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishadm/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -15,9 +15,9 @@
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	${PTHREAD_LIBS} ${NET_LIBS}
 
-%.1: $(top_srcdir)/doc/sphinx/reference/%.rst
+varnishadm.1: $(top_srcdir)/doc/sphinx/reference/varnishadm.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? $@
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -117,9 +117,9 @@
 # Explicitly record dependency
 mgt_vcc.c:	default_vcl.h
 
-%.1: ../../doc/sphinx/reference/%.rst
+varnishd.1: $(top_srcdir)/doc/sphinx/reference/varnishd.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? @
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

Modified: trunk/varnish-cache/bin/varnishhist/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishhist/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishhist/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -14,9 +14,9 @@
 	-lm \
 	${CURSES_LIBS} ${PTHREAD_LIBS}
 
-%.1: ../../doc/sphinx/reference/%.rst
+varnishhist.1: $(top_srcdir)/doc/sphinx/reference/varnishhist.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? $@
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

Modified: trunk/varnish-cache/bin/varnishlog/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishlog/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishlog/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -14,9 +14,9 @@
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${PTHREAD_LIBS}
 
-%.1: ../../doc/sphinx/reference/%.rst
+varnishlog.1: $(top_srcdir)/doc/sphinx/reference/varnishlog.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? $@
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

Modified: trunk/varnish-cache/bin/varnishncsa/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishncsa/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -14,9 +14,9 @@
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${PTHREAD_LIBS}
 
-%.1: ../../doc/sphinx/reference/%.rst
+varnishncsa.1: $(top_srcdir)/doc/sphinx/reference/varnishncsa.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? $@
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

Modified: trunk/varnish-cache/bin/varnishreplay/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishreplay/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishreplay/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -15,9 +15,9 @@
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${PTHREAD_LIBS} ${NET_LIBS}
 
-%.1: ../../doc/sphinx/reference/%.rst
+varnishreplay.1: $(top_srcdir)/doc/sphinx/reference/varnishreplay.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? $@
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

Modified: trunk/varnish-cache/bin/varnishsizes/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishsizes/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishsizes/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -14,9 +14,9 @@
 	-lm \
 	${CURSES_LIBS} ${PTHREAD_LIBS}
 
-%.1: $(top_srcdir)/doc/sphinx/reference/%.rst
+varnishsizes.1: $(top_srcdir)/doc/sphinx/reference/varnishsizes.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? $@
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

Modified: trunk/varnish-cache/bin/varnishstat/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishstat/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishstat/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -17,9 +17,9 @@
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${CURSES_LIBS} ${RT_LIBS} ${PTHREAD_LIBS}
 
-%.1: ../../doc/sphinx/reference/%.rst
+varnishstat.1: $(top_srcdir)/doc/sphinx/reference/varnishstat.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? $@
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

Modified: trunk/varnish-cache/bin/varnishtest/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishtest/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishtest/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -33,9 +33,9 @@
 EXTRA_DIST = $(top_srcdir)/bin/varnishtest/tests/*.vtc \
 	$(top_srcdir)/bin/varnishtest/tests/README
 
-%.1: ../../doc/sphinx/reference/%.rst
+varnishtest.1: $(top_srcdir)/doc/sphinx/reference/varnishtest.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? $@
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

Modified: trunk/varnish-cache/bin/varnishtop/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishtop/Makefile.am	2010-10-28 08:53:22 UTC (rev 5484)
+++ trunk/varnish-cache/bin/varnishtop/Makefile.am	2010-10-28 12:18:39 UTC (rev 5485)
@@ -13,9 +13,9 @@
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${CURSES_LIBS} ${PTHREAD_LIBS}
 
-%.1: ../../doc/sphinx/reference/%.rst
+varnishtop.1: $(top_srcdir)/doc/sphinx/reference/varnishtop.rst
 if HAVE_RST2MAN
-	${RST2MAN} $< >$@
+	${RST2MAN} $? $@
 else
 	@echo "========================================"
 	@echo "You need rst2man installed to make dist"

More information about the varnish-commit mailing list