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

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d31e8a3d..b3af5227 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,28 +2,23 @@
 
 info_TEXINFOS = tinc.texi
 
-man_MANS = tincd.8 tinc.conf.5
+man_MANS = tincd.8 tinc.8 tinc.conf.5 tinc-gui.8
 
-EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.conf.5.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 tinc.conf.5 tincinclude.texi
+CLEANFILES = *.html tincd.8 tinc.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@
+tincd.8.html: tincd.8
+	$(AM_V_GEN)w3mman2html $? > $@
 
-# For additional rules usually of interest only to the maintainer,
-# see GNUmakefile and Makefile.maint.
+tinc.8.html: tinc.8
+	$(AM_V_GEN)w3mman2html $? > $@
 
-sample-config.tar.gz: sample-config
-	GZIP=$(GZIP_ENV) $(AMTAR) --exclude .svn chozf sample-config.tar.gz sample-config
+tinc-gui.8.html: tinc-gui.8
+	$(AM_V_GEN)w3mman2html $? > $@
 
-texi2html: tinc.texi
-	texi2html -split=chapter tinc.texi
-
-%.html: $(man_MANS)
-	w3mman2html $< > $@
+tinc.conf.5.html: tinc.conf.5
+	$(AM_V_GEN)w3mman2html $? > $@
 
 substitute = sed \
 	-e s,'@PACKAGE\@',"$(PACKAGE)",g \
@@ -32,12 +27,18 @@ substitute = sed \
 	-e s,'@localstatedir\@',"$(localstatedir)",g
 
 tincd.8: tincd.8.in
-	$(substitute) tincd.8.in > tincd.8
+	$(AM_V_GEN)$(substitute) $? > $@
+
+tinc.8: tinc.8.in
+	$(AM_V_GEN)$(substitute) $? > $@
+
+tinc-gui.8: tinc-gui.8.in
+	$(AM_V_GEN)$(substitute) $? > $@
 
 tinc.conf.5: tinc.conf.5.in
-	$(substitute) tinc.conf.5.in > tinc.conf.5
+	$(AM_V_GEN)$(substitute) $? > $@
 
 tincinclude.texi: tincinclude.texi.in
-	$(substitute) tincinclude.texi.in > tincinclude.texi
+	$(AM_V_GEN)$(substitute) $? > $@
 	
 tinc.texi: tincinclude.texi