X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=doc%2FMakefile.am;h=b3af5227e577f0f1e0f04c5d64c0f5cb2eb1571e;hb=a0baeddb8aa745007d0302ed06247cabb8facb32;hp=8f0305e4c2901d9e2f1dc90b98eed61bacb94c06;hpb=19be9cf7150858311f7898fa3fb525d692d02f64;p=tinc

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8f0305e4..b3af5227 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,37 +2,23 @@
 
 info_TEXINFOS = tinc.texi
 
-man_MANS = tincd.8 tincctl.8 tinc.conf.5 tinc-gui.8
+man_MANS = tincd.8 tinc.8 tinc.conf.5 tinc-gui.8
 
-EXTRA_DIST = tincinclude.texi.in tincd.8.in tincctl.8.in tinc.conf.5.in tinc-gui.8.in sample-config.tar.gz
+EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.8.in tinc.conf.5.in tinc-gui.8.in sample-config
 
-CLEANFILES = *.html tinc.info tincd.8 tincctl.8 tinc.conf.5 tinc-gui.8 tincinclude.texi
-
-# Use `ginstall' in the definition of man_MANS to avoid
-# confusion with the `install' target.  The install rule transforms `ginstall'
-# to install before applying any user-specified name transformations.
-transform = s/ginstall/install/; @program_transform_name@
-
-# For additional rules usually of interest only to the maintainer,
-# see GNUmakefile and Makefile.maint.
-
-sample-config.tar.gz: sample-config
-	GZIP=$(GZIP_ENV) $(AMTAR) chozf sample-config.tar.gz --exclude .svn sample-config
-
-texi2html: tinc.texi
-	texi2html -split=chapter tinc.texi
+CLEANFILES = *.html tincd.8 tinc.8 tinc.conf.5 tinc-gui.8 tincinclude.texi
 
 tincd.8.html: tincd.8
-	w3mman2html $< > $@
+	$(AM_V_GEN)w3mman2html $? > $@
 
-tincctl.8.html: tincctl.8
-	w3mman2html $< > $@
+tinc.8.html: tinc.8
+	$(AM_V_GEN)w3mman2html $? > $@
 
 tinc-gui.8.html: tinc-gui.8
-	w3mman2html $< > $@
+	$(AM_V_GEN)w3mman2html $? > $@
 
 tinc.conf.5.html: tinc.conf.5
-	w3mman2html $< > $@
+	$(AM_V_GEN)w3mman2html $? > $@
 
 substitute = sed \
 	-e s,'@PACKAGE\@',"$(PACKAGE)",g \
@@ -41,18 +27,18 @@ substitute = sed \
 	-e s,'@localstatedir\@',"$(localstatedir)",g
 
 tincd.8: tincd.8.in
-	$(substitute) $< > $@
+	$(AM_V_GEN)$(substitute) $? > $@
 
-tincctl.8: tincctl.8.in
-	$(substitute) $< > $@
+tinc.8: tinc.8.in
+	$(AM_V_GEN)$(substitute) $? > $@
 
 tinc-gui.8: tinc-gui.8.in
-	$(substitute) $< > $@
+	$(AM_V_GEN)$(substitute) $? > $@
 
 tinc.conf.5: tinc.conf.5.in
-	$(substitute) $< > $@
+	$(AM_V_GEN)$(substitute) $? > $@
 
 tincinclude.texi: tincinclude.texi.in
-	$(substitute) $< > $@
+	$(AM_V_GEN)$(substitute) $? > $@
 	
 tinc.texi: tincinclude.texi