X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=distributions;h=89c96275b775c74a45b636442b5537846a163b3a;hb=615b50b8ed9ae9f18452a4318b1fa9dba69e9b36;hp=30d1be12f1e55b018bda75443b83f31aa4ab0516;hpb=2ffcc80440e1f6d1965c82cdd36de208a7e15734;p=silc.git

diff --git a/distributions b/distributions
index 30d1be12..89c96275 100644
--- a/distributions
+++ b/distributions
@@ -12,7 +12,20 @@
 # The format of this file is as follows:
 #
 # _<name>_SUBDIRS			Subdirs for the distribution
-# _<name>_SUBIDRS_<dir>                 Subdirs under <dir>
+# _<name>_SUBDIRS_<dir>                 Subdirs under <dir>
+# _<name>_DISTLABEL                     Preprocessor label
+#
+# DISTRBUTIONS=<distributions>
+#
+# The _SUBDIRS define all the subdirectories that the Makefile should
+# traverse.  The _SUBDIRS_<dir> defines all subdirectories in the 
+# subdirectory <dir>.  The _DISTLABEL defines a preprocessor label
+# that can be used in the source code like `#ifdef SILC_DIST_CLIENT' to
+# define code only for the specific distribution.  The label can also be
+# used in the Makefiles by `if SILC_DIST_CLIENT' to define something in
+# the Makefile only for the specific distribution.
+#
+# The DISTRIBUTIONS defines all distributions in this file.
 #
 # NOTE: For now this supports only one sublevel of the directories.
 #       Also make sure that the <dir> directory includes Makefile.am.pre
@@ -20,23 +33,41 @@
 #       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 silc silcd doc includes
-_toolkit_SUBDIRS_lib=$(SUBDIRS)
+# Default Toolkit distribution
+_toolkit_SUBDIRS=lib irssi silc silcd doc includes win32
+_toolkit_SUBDIRS_lib=$(COMMONDIRS)
+_toolkit_SUBDIRS_doc=$(COMMONDIRS)
+_toolkit_DISTLABEL=SILC_DIST_TOOLKIT
 
+# Irssi SILC Client distribution
 _client_SUBDIRS=lib irssi doc includes
-_client_SUBDIRS_lib=$(SUBDIRS)
+_client_SUBDIRS_lib=contrib silccore silccrypt silcsim silcmath silcske silcutil trq silcclient
+_client_SUBDIRS_doc=$(COMMONDIRS)
+_client_DISTLABEL=SILC_DIST_CLIENT
 
+# SILC Server distribution
 _server_SUBDIRS=lib silcd doc includes
 _server_SUBDIRS_lib=contrib silccore silccrypt silcsim silcmath silcske silcutil trq dotconf
+_server_SUBDIRS_doc=$(COMMONDIRS)
+_server_DISTLABEL=SILC_DIST_SERVER
+
+# Native WIN32 SILC library distribution (will include only the libraries)
+_win32dll_SUBDIRS=lib doc includes
+_win32dll_SUBDIRS_lib=silccore silccrypt silcsim silcmath silcske silcutil trq silcclient
+_win32dll_SUBDIRS_doc=$(COMMONDIRS)
+_win32dll_DISTLABEL=SILC_DIST_WIN32DLL
+
+DISTRIBUTIONS=toolkit client server win32dll