[master] f0e1961 Get rid of the separate opt2rst programs by integrating the functionaly into VUT_Init().

[Poul-Henning Kamp]

commit f0e19615e91dea011c39e2f0df83bc03d15f79cb
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 10 09:10:00 2016 +0000

    Get rid of the separate opt2rst programs by integrating the
    functionaly into VUT_Init().

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index 14127df..0b922e6 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -132,31 +132,31 @@ BUILT_SOURCES += include/counters.rst
 
 # XXX add varnishstat here when it's been _opt2rst'ed
 
-include/varnishncsa_options.rst: $(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst
-	$(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst options > $@
-include/varnishncsa_synopsis.rst: $(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst
-	$(top_builddir)/bin/varnishncsa/varnishncsa_opt2rst synopsis > $@
+include/varnishncsa_options.rst: $(top_builddir)/bin/varnishncsa/varnishncsa
+	$(top_builddir)/bin/varnishncsa/varnishncsa --options > $@
+include/varnishncsa_synopsis.rst: $(top_builddir)/bin/varnishncsa/varnishncsa
+	$(top_builddir)/bin/varnishncsa/varnishncsa --synopsis > $@
 BUILT_SOURCES += include/varnishncsa_options.rst \
 	include/varnishncsa_synopsis.rst
 
-include/varnishlog_options.rst: $(top_builddir)/bin/varnishlog/varnishlog_opt2rst
-	$(top_builddir)/bin/varnishlog/varnishlog_opt2rst options > $@
-include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog_opt2rst
-	$(top_builddir)/bin/varnishlog/varnishlog_opt2rst synopsis > $@
+include/varnishlog_options.rst: $(top_builddir)/bin/varnishlog/varnishlog
+	$(top_builddir)/bin/varnishlog/varnishlog --options > $@
+include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog
+	$(top_builddir)/bin/varnishlog/varnishlog --synopsis > $@
 BUILT_SOURCES += include/varnishlog_options.rst \
 	include/varnishlog_synopsis.rst
 
-include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst
-	$(top_builddir)/bin/varnishtop/varnishtop_opt2rst options > $@
-include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst
-	$(top_builddir)/bin/varnishtop/varnishtop_opt2rst synopsis > $@
+include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop
+	$(top_builddir)/bin/varnishtop/varnishtop --options > $@
+include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop
+	$(top_builddir)/bin/varnishtop/varnishtop --synopsis > $@
 BUILT_SOURCES += include/varnishtop_options.rst \
 	 include/varnishtop_synopsis.rst
 
-include/varnishhist_options.rst: $(top_builddir)/bin/varnishhist/varnishhist_opt2rst
-	$(top_builddir)/bin/varnishhist/varnishhist_opt2rst options > $@
-include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist_opt2rst
-	$(top_builddir)/bin/varnishhist/varnishhist_opt2rst synopsis > $@
+include/varnishhist_options.rst: $(top_builddir)/bin/varnishhist/varnishhist
+	$(top_builddir)/bin/varnishhist/varnishhist --options > $@
+include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist
+	$(top_builddir)/bin/varnishhist/varnishhist --synopsis > $@
 BUILT_SOURCES += include/varnishhist_options.rst \
 	 include/varnishhist_synopsis.rst
 
diff --git a/doc/sphinx/Makefile.phk b/doc/sphinx/Makefile.phk
index 35bea90..57689bd 100644
--- a/doc/sphinx/Makefile.phk
+++ b/doc/sphinx/Makefile.phk
@@ -207,29 +207,29 @@ include/params.rst: ../../bin/varnishd/varnishd
 # only sphinx needs the opt2rst stuff anyway
 %_opt2rst: ../../bin/%/%_options.h %_options.c
 
-include/varnishncsa_options.rst: varnishncsa_opt2rst
-	../../bin/varnishncsa/varnishncsa_opt2rst options > $@
+include/varnishncsa_options.rst: varnishncsa
+	../../bin/varnishncsa/varnishncsa --options > $@
 
-include/varnishncsa_synopsis.rst: varnishncsa_opt2rst
-	../../bin/varnishncsa/varnishncsa_opt2rst synopsis > $@
+include/varnishncsa_synopsis.rst: varnishncsa
+	../../bin/varnishncsa/varnishncsa --synopsis > $@
 
-include/varnishlog_options.rst: varnishlog_opt2rst
-	../../bin/varnishlog/varnishlog_opt2rst options > $@
+include/varnishlog_options.rst: varnishlog
+	../../bin/varnishlog/varnishlog --options > $@
 
-include/varnishlog_synopsis.rst: varnishlog_opt2rst
-	../../bin/varnishlog/varnishlog_opt2rst synopsis > $@
+include/varnishlog_synopsis.rst: varnishlog
+	../../bin/varnishlog/varnishlog --synopsis > $@
 
-include/varnishtop_options.rst: varnishtop_opt2rst
-	../../bin/varnishtop/varnishtop_opt2rst options > $@
+include/varnishtop_options.rst: varnishtop
+	../../bin/varnishtop/varnishtop --options > $@
 
-include/varnishtop_synopsis.rst: varnishtop_opt2rst
-	../../bin/varnishtop/varnishtop_opt2rst synopsis > $@
+include/varnishtop_synopsis.rst: varnishtop
+	../../bin/varnishtop/varnishtop --synopsis > $@
 
-include/varnishhist_options.rst: varnishhist_opt2rst
-	./varnishhist_opt2rst options > $@
+include/varnishhist_options.rst: varnishhist
+	./varnishhist --options > $@
 
-include/varnishhist_synopsis.rst: varnishhist_opt2rst
-	./varnishhist_opt2rst synopsis > $@
+include/varnishhist_synopsis.rst: varnishhist
+	./varnishhist --synopsis > $@
 
 reference/vmod_std.generated.rst: reference ../../lib/libvmod_std/vmod_std.rst
 	cp ../../lib/libvmod_std/vmod_std.rst $@