X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=doc%2FMakefile.am;h=5c64ffa008c684948acd3dada4bf0fa451df4c59;hp=66de6d93c2e1b223f87494d4c4c35a1f39520dde;hb=706d855e507980de3845556989d7de7a3b9c76e8;hpb=075e6828a7533e7daa790225f17aa6bb39703278

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 66de6d93..5c64ffa0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,11 +2,11 @@
 
 info_TEXINFOS = tinc.texi
 
-man_MANS = tincd.8 tincctl.8 tinc.conf.5
+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 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.tar.gz
 
-CLEANFILES = *.html tinc.info tincd.8 tincctl.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'
@@ -17,19 +17,19 @@ transform = s/ginstall/install/; @program_transform_name@
 # 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
+	GZIP=$(GZIP_ENV) $(AMTAR) chozf $@ --exclude .svn $<
 
 tincd.8.html: tincd.8
-	w3mman2html $< > $@
+	w3mman2html $? > $@
+
+tinc.8.html: tinc.8
+	w3mman2html $? > $@
 
-tincctl.8.html: tincctl.8
-	w3mman2html $< > $@
+tinc-gui.8.html: tinc-gui.8
+	w3mman2html $? > $@
 
 tinc.conf.5.html: tinc.conf.5
-	w3mman2html $< > $@
+	w3mman2html $? > $@
 
 substitute = sed \
 	-e s,'@PACKAGE\@',"$(PACKAGE)",g \
@@ -38,15 +38,18 @@ substitute = sed \
 	-e s,'@localstatedir\@',"$(localstatedir)",g
 
 tincd.8: tincd.8.in
-	$(substitute) tincd.8.in > tincd.8
+	$(substitute) $? > $@
+
+tinc.8: tinc.8.in
+	$(substitute) $? > $@
 
-tincctl.8: tincctl.8.in
-	$(substitute) tincctl.8.in > tincctl.8
+tinc-gui.8: tinc-gui.8.in
+	$(substitute) $? > $@
 
 tinc.conf.5: tinc.conf.5.in
-	$(substitute) tinc.conf.5.in > tinc.conf.5
+	$(substitute) $? > $@
 
 tincinclude.texi: tincinclude.texi.in
-	$(substitute) tincinclude.texi.in > tincinclude.texi
+	$(substitute) $? > $@
 	
 tinc.texi: tincinclude.texi