Merged silc_1_0_branch to trunk.

[silc.git] / distdir / toolkit

diff --git a/distdir/toolkit b/distdir/toolkit
index de5af055a80a802e9e51450a4cc02cb313d71444..bb062bd210f0633249209364c876d73ac6573562 100644 (file)
--- a/distdir/toolkit
+++ b/distdir/toolkit
@@ -2,17 +2,39 @@ name Toolkit
 package silc-toolkit
 bug-report silc-devel@lists.silcnet.org
 
+# Inherits
 inherit common
 inherit client
 inherit server
+
+# License
+license distdir/TOOLKIT
+include distdir/GPL GPL
+include distdir/BSD BSD
+license-header distdir/GPL-header distdir/TOOLKIT-header
+
+# Distdefs
 define SILC_DIST_TOOLKIT
+# SFTP is undefined in server, so force it here
+define SILC_DIST_SFTP
 
+# Includes
 include README.CVS
 include README.WIN32
 include README.MACOSX
-include silcer
+include apps/silcer
+include apps/silc
 include tutorial
 
+# Noprocess to optimize packaging and avoid re-licensing of certain files
+noprocess COPYING GPL BSD
+noprocess doc/toolkit/
+noprocess apps/
+noprocess win32/
+noprocess lib/silcutil/silcconfig.[ch]
+
 pre-hook distdir/pre-run
 post-process-dist-hook distdir/post-process-dist
+pre-dist-hook distdir/pre-dist-toolkit
 post-dist-hook distdir/post-dist
+