X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=doc%2FMakefile.am.pre;h=6fc615506e43700d894840a5567bad01b4f7b374;hp=6fb9bf0f4bdc39ce823c9d7f56b473c7862e38e6;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=4b5e3a30bd947a837ab24e1654b06ef002c274e4

diff --git a/doc/Makefile.am.pre b/doc/Makefile.am.pre
index 6fb9bf0f..6fc61550 100644
--- a/doc/Makefile.am.pre
+++ b/doc/Makefile.am.pre
@@ -24,24 +24,13 @@ DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 makerfc = ../scripts/makerfc
 
 all:
-	touch draft-riikonen-silc-spec-05.txt
-	touch draft-riikonen-silc-pp-05.txt
-	touch draft-riikonen-silc-ke-auth-05.txt
-	touch draft-riikonen-silc-commands-03.txt
-	touch draft-riikonen-silc-flags-payloads-00.txt
-	touch draft-riikonen-presence-attrs-00.txt
+	touch draft-riikonen-silc-spec-06.txt
+	touch draft-riikonen-silc-pp-06.txt
+	touch draft-riikonen-silc-ke-auth-06.txt
+	touch draft-riikonen-silc-commands-04.txt
+	touch draft-riikonen-silc-flags-payloads-02.txt
+	touch draft-riikonen-presence-attrs-01.txt
 
-if SILC_DIST_CLIENT
-dist-hook:
-	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
-	rm draft-riikonen*.txt
-	touch draft-riikonen-silc-spec-05.txt
-	touch draft-riikonen-silc-pp-05.txt
-	touch draft-riikonen-silc-ke-auth-05.txt
-	touch draft-riikonen-silc-commands-03.txt
-	touch draft-riikonen-silc-flags-payloads-00.txt
-	touch draft-riikonen-presence-attrs-00.txt
-else
 if SILC_DIST_TOOLKIT
 toolkit-ref-html:
 	-@if test -f $(SILC_TOP_SRCDIR)/util/robodoc/Source/robodoc ; then \
@@ -53,50 +42,58 @@ toolkit-ref-html:
 	  echo ROBODoc is not compiled! Cannot generate documentation! ; \
         fi
 
-toolkit-ref-ps:
+toolkit-ref-pdf:
 	-@if test -f $(SILC_TOP_SRCDIR)/util/robodoc/Source/robodoc ; then \
 	  echo Generating Toolkit Reference Manual ; \
 	  cd ../scripts/silcdoc ; \
 	  ./silcdoc PS ../../lib/ $(SILC_TOP_SRCDIR)/doc/toolkit.ps \
 	  $(SILC_TOP_SRCDIR)/util/robodoc/Source/robodoc ; \
+	  ps2pdf $(SILC_TOP_SRCDIR)/doc/toolkit.ps $(SILC_TOP_SRCDIR)/doc/toolkit.pdf; \
+          rm -rf $(SILC_TOP_SRCDIR)/doc/toolkit.ps; \
 	else  \
 	  echo ROBODoc is not compiled! Cannot generate documentation! ; \
         fi
 
-toolkit-ref-pdf:
-	-ps2pdf $(SILC_TOP_SRCDIR)/doc/toolkit.ps $(SILC_TOP_SRCDIR)/doc/toolkit.pdf
-endif
-
 dist-hook:
 	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
-	touch draft-riikonen-silc-spec-05.txt
-	touch draft-riikonen-silc-pp-05.txt
-	touch draft-riikonen-silc-ke-auth-05.txt
-	touch draft-riikonen-silc-commands-03.txt
-	touch draft-riikonen-silc-flags-payloads-00.txt
-	touch draft-riikonen-presence-attrs-00.txt
-	$(makerfc) draft-riikonen-silc-spec-05.nroff \
-		draft-riikonen-silc-spec-05.txt
-	$(makerfc) draft-riikonen-silc-pp-05.nroff \
-		draft-riikonen-silc-pp-05.txt
-	$(makerfc) draft-riikonen-silc-ke-auth-05.nroff \
-		draft-riikonen-silc-ke-auth-05.txt
-	$(makerfc) draft-riikonen-silc-commands-03.nroff \
-		draft-riikonen-silc-commands-03.txt
-	$(makerfc) draft-riikonen-silc-flags-payloads-00.nroff \
-		draft-riikonen-silc-flags-payloads-00.txt
-	$(makerfc) draft-riikonen-presence-attrs-00.nroff \
-		draft-riikonen-presence-attrs-00.txt
+	touch draft-riikonen-silc-spec-06.txt
+	touch draft-riikonen-silc-pp-06.txt
+	touch draft-riikonen-silc-ke-auth-06.txt
+	touch draft-riikonen-silc-commands-04.txt
+	touch draft-riikonen-silc-flags-payloads-02.txt
+	touch draft-riikonen-presence-attrs-01.txt
+	$(makerfc) draft-riikonen-silc-spec-06.nroff \
+		draft-riikonen-silc-spec-06.txt
+	$(makerfc) draft-riikonen-silc-pp-06.nroff \
+		draft-riikonen-silc-pp-06.txt
+	$(makerfc) draft-riikonen-silc-ke-auth-06.nroff \
+		draft-riikonen-silc-ke-auth-06.txt
+	$(makerfc) draft-riikonen-silc-commands-04.nroff \
+		draft-riikonen-silc-commands-04.txt
+	$(makerfc) draft-riikonen-silc-flags-payloads-02.nroff \
+		draft-riikonen-silc-flags-payloads-02.txt
+	$(makerfc) draft-riikonen-presence-attrs-01.nroff \
+		draft-riikonen-presence-attrs-01.txt
 
+else
+dist-hook:
+	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
+	rm draft-riikonen*.txt
+	touch draft-riikonen-silc-spec-06.txt
+	touch draft-riikonen-silc-pp-06.txt
+	touch draft-riikonen-silc-ke-auth-06.txt
+	touch draft-riikonen-silc-commands-04.txt
+	touch draft-riikonen-silc-flags-payloads-02.txt
+	touch draft-riikonen-presence-attrs-01.txt
 endif
 
 if SILC_DIST_TOOLKIT
-SILC_EXTRA_DIST = toolkit examples
+SILC_EXTRA_DIST = toolkit examples silc.1 silcd.8 silcd.conf.5
 else
 if SILC_DIST_SERVER
-SILC_EXTRA_DIST = examples
+SILC_EXTRA_DIST = examples silcd.8 silcd.conf.5
 else
-SILC_EXTRA_DIST =
+SILC_EXTRA_DIST = silc.1
 endif
 endif