From 918728123e9dfe46e8fe3233fdcbcfeae61fcc2c Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Tue, 5 Jun 2001 11:17:54 +0000 Subject: [PATCH] updates. --- Makefile.am.pre | 3 ++- apps/irssi/docs/help/Makefile.am.gen | 1 + configure.in.pre | 1 - distributions | 12 ++++++------ doc/{Makefile.am => Makefile.am.pre} | 10 +++++++++- lib/Makefile.am.pre | 8 ++------ prepare | 4 ++-- 7 files changed, 22 insertions(+), 17 deletions(-) rename doc/{Makefile.am => Makefile.am.pre} (88%) diff --git a/Makefile.am.pre b/Makefile.am.pre index faeab165..48c7658b 100644 --- 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 c836962b..288f8a91 100644 --- 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 0731f1cb..0483756e 100644 --- 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 6da1b27f..ae71752f 100644 --- 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 __SUBDIRS_ 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 __SUBDIRS_. 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 31dd90af..0914e3bb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am.pre @@ -3,7 +3,7 @@ # # Author: Pekka Riikonen # -# 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 107912a8..0e938f78 100644 --- 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 2a749e6e..2d3e0a6e 100755 --- 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 -- 2.24.0