X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=doc%2FMakefile.ad;fp=doc%2FMakefile.am.pre;h=f6c1b5f3377c8d90c3a067c668e7874d0b1f6c33;hp=edb11a70f8c0119aced30dc70260fb06996a9a73;hb=c257b555225193e54d85daf541d29578b3c93882;hpb=f658940d02cf2fd893296b6a7825b42502573668

diff --git a/doc/Makefile.am.pre b/doc/Makefile.ad
similarity index 56%
rename from doc/Makefile.am.pre
rename to doc/Makefile.ad
index edb11a70..f6c1b5f3 100644
--- a/doc/Makefile.am.pre
+++ b/doc/Makefile.ad
@@ -1,14 +1,13 @@
 #
-#  Makefile.am
+#  Makefile.ad
 #
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2001 Pekka Riikonen
+#  Copyright (C) 2000 - 2005 Pekka Riikonen
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
+#  the Free Software Foundation; version 2 of the License.
 #
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,20 +17,17 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-COMMONDIRS = .
-SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
-DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
-makerfc = ../scripts/makerfc
-
 all:
 	touch draft-riikonen-silc-spec-08.txt
-	touch draft-riikonen-silc-pp-08.txt
-	touch draft-riikonen-silc-ke-auth-07.txt
+	touch draft-riikonen-silc-pp-09.txt
+	touch draft-riikonen-silc-ke-auth-08.txt
 	touch draft-riikonen-silc-commands-06.txt
-	touch draft-riikonen-silc-flags-payloads-03.txt
-	touch draft-riikonen-presence-attrs-02.txt
+	touch draft-riikonen-silc-flags-payloads-04.txt
+	touch draft-riikonen-presence-attrs-03.txt
+
+#ifdef SILC_DIST_TOOLKIT
+makerfc = $(SILC_TOP_SRCDIR)/scripts/makerfc
 
-if SILC_DIST_TOOLKIT
 toolkit-ref-html:
 	-@if test -f $(SILC_TOP_SRCDIR)/util/robodoc/Source/robodoc ; then \
 	  echo Generating Toolkit Reference Manual ; \
@@ -55,51 +51,52 @@ toolkit-ref-pdf:
         fi
 
 dist-hook:
+	rm -rf `find $(top_distdir)/doc -name CVS`
 	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
 	touch draft-riikonen-silc-spec-08.txt
-	touch draft-riikonen-silc-pp-08.txt
-	touch draft-riikonen-silc-ke-auth-07.txt
+	touch draft-riikonen-silc-pp-09.txt
+	touch draft-riikonen-silc-ke-auth-08.txt
 	touch draft-riikonen-silc-commands-06.txt
-	touch draft-riikonen-silc-flags-payloads-03.txt
-	touch draft-riikonen-presence-attrs-02.txt
+	touch draft-riikonen-silc-flags-payloads-04.txt
+	touch draft-riikonen-presence-attrs-03.txt
 	$(makerfc) draft-riikonen-silc-spec-08.nroff \
 		draft-riikonen-silc-spec-08.txt
-	$(makerfc) draft-riikonen-silc-pp-08.nroff \
-		draft-riikonen-silc-pp-08.txt
-	$(makerfc) draft-riikonen-silc-ke-auth-07.nroff \
-		draft-riikonen-silc-ke-auth-07.txt
+	$(makerfc) draft-riikonen-silc-pp-09.nroff \
+		draft-riikonen-silc-pp-09.txt
+	$(makerfc) draft-riikonen-silc-ke-auth-08.nroff \
+		draft-riikonen-silc-ke-auth-08.txt
 	$(makerfc) draft-riikonen-silc-commands-06.nroff \
 		draft-riikonen-silc-commands-06.txt
-	$(makerfc) draft-riikonen-silc-flags-payloads-03.nroff \
-		draft-riikonen-silc-flags-payloads-03.txt
-	$(makerfc) draft-riikonen-presence-attrs-02.nroff \
-		draft-riikonen-presence-attrs-02.txt
+	$(makerfc) draft-riikonen-silc-flags-payloads-04.nroff \
+		draft-riikonen-silc-flags-payloads-04.txt
+	$(makerfc) draft-riikonen-presence-attrs-03.nroff \
+		draft-riikonen-presence-attrs-03.txt
 
-else
+#else !SILC_DIST_TOOLKIT
 dist-hook:
+	rm -rf `find $(top_distdir)/doc -name CVS`
 	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
 	rm draft-riikonen*.txt
 	touch draft-riikonen-silc-spec-08.txt
-	touch draft-riikonen-silc-pp-08.txt
-	touch draft-riikonen-silc-ke-auth-07.txt
+	touch draft-riikonen-silc-pp-09.txt
+	touch draft-riikonen-silc-ke-auth-08.txt
 	touch draft-riikonen-silc-commands-06.txt
 	touch draft-riikonen-silc-flags-payloads-04.txt
-	touch draft-riikonen-presence-attrs-02.txt
-endif
-
-if SILC_DIST_TOOLKIT
-SILC_EXTRA_DIST = toolkit examples silc.1 silcd.8 silcd.conf.5
-else
-if SILC_DIST_SERVER
-SILC_EXTRA_DIST = examples silcd.8 silcd.conf.5
-else
-SILC_EXTRA_DIST = silc.1
-endif
-endif
+	touch draft-riikonen-presence-attrs-03.txt
+#endif SILC_DIST_TOOLKIT
 
-EXTRA_DIST = \
-	CodingStyle \
-	FAQ \
-	example_silcd.conf \
-	silcalgs.conf \
-	draft-riikonen*.txt $(SILC_EXTRA_DIST)
+EXTRA_DIST = 			\
+#ifdef SILC_DIST_CLIENT
+	silc.1			\
+#endif SILC_DIST_CLIENT
+#ifdef SILC_DIST_SERVER
+	examples silcd.8 silcd.conf.5	\
+#endif SILC_DIST_SERVER
+#ifdef SILC_DIST_TOOLKIT
+	toolkit			\
+	CodingStyle 		\
+#endif SILC_DIST_TOOLKIT
+	FAQ 			\
+	example_silcd.conf 	\
+	silcalgs.conf 		\
+	draft-riikonen*.txt