updates.

diff --git a/Makefile.am.pre b/Makefile.am.pre
index faeab16501b0d72ab9b87571c032e99fd2da4cd8..48c7658bdc634fc69ec9ecd9ddc32f0a417c1b51 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -18,7 +18,8 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-SUBDIRS = lib irssi silc silcd doc includes
+COMMONDIRS = lib irssi silc silcd doc includes
+SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/apps/irssi/docs/help/Makefile.am.gen b/apps/irssi/docs/help/Makefile.am.gen
index c836962bb38cc2dbdd2498c7e8dd34f2228d2f63..288f8a91908b364c8d5dc7ff5f8c61a0ca1276bf 100644 (file)
--- a/apps/irssi/docs/help/Makefile.am.gen
+++ b/apps/irssi/docs/help/Makefile.am.gen
@@ -12,3 +12,4 @@ EXTRA_DIST = \
        $(help_DATA)
 
 SUBDIRS = in
+DIST_SUBDIRS =

diff --git a/configure.in.pre b/configure.in.pre
index 0731f1cb8ac120d3e5cce5bf183a15ba9b86d192..0483756e45e493242757cb16ecf6085554dcfadb 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -49,7 +49,6 @@ AC_SUBST(LN_S)
 # Distribution definition. ./prepare will automatically add here a correct
 # value. Do not edit!
 AC_DEFINE(SILC_DIST_DEFINE)
-AM_CONDITIONAL(SILC_DIST_DEFINE, test xtrue = xtrue)
 
 # XXX
 # Compiler flags

diff --git a/distributions b/distributions
index 6da1b27f8304efced39600468976d550df243a3e..ae71752f85078de9fe40863cc0ec18e675a6d2e8 100644 (file)
--- a/distributions
+++ b/distributions
@@ -33,25 +33,25 @@
 #       must have DIST_SUBDIRS = SILC_DISTRIBUTIONS_SUBDIRS line in it.
 #
 # NOTE: Also note that if any subdirectory has Makefile.am.pre then you
-#       must list it here as _<name>_SUBDIRS_<dir> and either define the
-#       directories one by one or use $(SUBDIRS) to use default to that
-#       Makefile.  Otherwise, ./prepare cannot create correct Makefile.am.
+#       must list it here as _<name>_SUBDIRS_<dir>. To define all sub
+#       directories use $(COMMONDIRS) that must be defined in the Makefile
+#       and list all subdirs.
 #
 # Example:
 #
 # _xyz_SUBDIRS=lib irssi doc includes
-# _xyz_SUBDIRS_lib=$(SUBDIRS)
+# _xyz_SUBDIRS_lib=$(COMMONDIRS)
 # _xyz_DISTLABEL=SILC_DIST_XYZ
 #
 # To prepare the distribution give command ./prepare xyz 1.0.4
 #
 
 _toolkit_SUBDIRS=lib irssi silc silcd doc includes
-_toolkit_SUBDIRS_lib=$(SUBDIRS)
+_toolkit_SUBDIRS_lib=$(COMMONDIRS)
 _toolkit_DISTLABEL=SILC_DIST_TOOLKIT
 
 _client_SUBDIRS=lib irssi doc includes
-_client_SUBDIRS_lib=$(SUBDIRS)
+_client_SUBDIRS_lib=contrib silccore silccrypt silcsim silcmath silcske silcutil trq silcclient
 _client_DISTLABEL=SILC_DIST_CLIENT
 
 _server_SUBDIRS=lib silcd doc includes

diff --git a/doc/Makefile.am b/doc/Makefile.am.pre
similarity index 88%
rename from doc/Makefile.am
rename to doc/Makefile.am.pre
index 31dd90af85d9a48761f8a1c2b353df8830d6e16b..0914e3bb6fe5b7c4d06aa3232e73ea28802a8937 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am.pre
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 #
-#  Copyright (C) 2000 Pekka Riikonen
+#  Copyright (C) 2000 - 2001 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
@@ -18,6 +18,10 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+COMMONDIRS = 
+SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
+DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
+
 all:
        touch draft-riikonen-silc-spec-02.txt
        touch draft-riikonen-silc-pp-02.txt
@@ -25,6 +29,9 @@ all:
        touch draft-riikonen-silc-commands-00.txt
        -cd ..
 
+if SILC_DIST_CLIENT
+dist-hook:
+else
 dist-hook:
        touch draft-riikonen-silc-spec-02.txt
        touch draft-riikonen-silc-pp-02.txt
@@ -38,6 +45,7 @@ dist-hook:
                draft-riikonen-silc-ke-auth-02.txt
        ./makerfc draft-riikonen-silc-commands-00.nroff \
                draft-riikonen-silc-commands-00.txt
+endif
 
 EXTRA_DIST = \
        CodingStyle \

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index 107912a835c0ba1afa5cfee1af480e19e15f3a07..0e938f78294ad5d0939caed5dc08a01923cca81b 100644 (file)
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -26,16 +26,12 @@ COMMONDIRS = \
        silcmath \
        silcske \
        silcutil \
+       silcclient \
        dotconf \
        trq
 #        zlib
 
-if SILC_DIST_CLIENT
-SUBDIRS = $(COMMONDIRS) silcclient
-else
-SUBDIRS = $(COMMONDIRS)
-endif
-
+SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 
 # SILC Library dirs

diff --git a/prepare b/prepare
index 2a749e6e8dbbeb9effb02b7c5a0b97994257838a..2d3e0a6efb90b6fed4d6fcba1e6279b53cc5cd21 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -38,7 +38,7 @@
 # SILC Distribution versions. Set here or give the version on the command
 # line as argument.
 #
-SILC_VERSION=0.2.6                     # Base version
+SILC_VERSION=0.3                       # Base version
 
 
 #############################################################################
@@ -78,7 +78,7 @@ do
     continue;
   fi
   if [ -f Makefile.am.pre ]; then
-    sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$sub/" Makefile.am.pre >Makefile.am 2>/dev/null
+    sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$sub/" -e "/SILC_DISTRIBUTION_SUBDIRS/s//$sub/" Makefile.am.pre >Makefile.am 2>/dev/null
   fi
   cd $path
 done