[master] b6eacbd Fix varnishhist Makefile

[Martin Blix Grydeland]

commit b6eacbde019ec778b6cbb6bbba5921e844d1ea04
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Feb 25 11:51:04 2014 +0100

    Fix varnishhist Makefile

diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index 986966f..748721b 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -7,8 +7,8 @@ bin_PROGRAMS = varnishhist
 varnishhist_SOURCES = varnishhist.c \
 	varnishhist_options.h \
 	varnishhist_options.c \
-	$(top_builddir)/lib/libvarnish/vas.c \
-	$(top_builddir)/lib/libvarnish/version.c \
+	$(top_srcdir)/lib/libvarnish/vas.c \
+	$(top_srcdir)/lib/libvarnish/version.c \
 	$(top_srcdir)/lib/libvarnish/vpf.c \
 	$(top_srcdir)/lib/libvarnish/vtim.c \
 	$(top_srcdir)/lib/libvarnish/flopen.c \
@@ -25,29 +25,3 @@ varnishhist_opt2rst_SOURCES = \
 	varnishhist_options.h \
 	varnishhist_options.c \
 	$(top_srcdir)/lib/libvarnishtools/opt2rst.c
-
-BUILT_SOURCES = varnishhist_options.rst varnishhist_synopsis.rst
-EXTRA_DIST = $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = $(EXTRA_DIST)
-
-varnishhist_options.rst:
-	./varnishhist_opt2rst options > $@
-varnishhist_synopsis.rst:
-	./varnishhist_opt2rst synopsis > $@
-
-if HAVE_RST2MAN
-varnishhist_options.rst varnishhist_synopsis.rst: varnishhist_opt2rst
-endif
-
-varnishhist.1: \
-	$(top_srcdir)/doc/sphinx/reference/varnishhist.rst \
-	varnishhist_options.rst \
-	varnishhist_synopsis.rst
-if HAVE_RST2MAN
-	${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishhist.rst $@
-else
-	@echo "========================================"
-	@echo "You need rst2man installed to make dist"
-	@echo "========================================"
-	@false
-endif