s4-waf: added 'waf dist' to our standalone libs as well

6 files changed, 16 insertions, 6 deletions

diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 88268b53ce..87ea8ccbef 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -1,7 +1,7 @@
 # customised version of 'waf dist' for Samba tools
 # uses git ls-files to get file lists
 
-import Utils, os, sys, tarfile, stat
+import Utils, os, sys, tarfile, stat, Scripting
 from samba_utils import *
 
 def add_tarfile(tar, fname, abspath):
@@ -16,10 +16,10 @@ def add_tarfile(tar, fname, abspath):
     fh.close()
 
 
-def dist(appname='', version=''):
+def dist():
 
-    if not appname: appname = Utils.g_module.APPNAME
-    if not version: version = Utils.g_module.VERSION
+    appname = Utils.g_module.APPNAME
+    version = Utils.g_module.VERSION
 
     env = LOAD_ENVIRONMENT()
     srcdir = os.path.normpath(os.path.join(os.path.dirname(Utils.g_module.root_path), Utils.g_module.srcdir))
@@ -65,3 +65,5 @@ def DIST_DIRS(conf, dirs):
     '''set the directories to package, relative to top srcdir'''
     if not conf.env.DIST_DIRS:
         conf.env.DIST_DIRS = dirs
+
+Scripting.dist = dist
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 2cfbe7a583..f9cb1a882f 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -23,6 +23,7 @@ import samba_conftests
 import tru64cc
 import irixcc
 import generic_cc
+import samba_dist
 
 # some systems have broken threading in python
 if os.environ.get('WAF_NOTHREADS') == '1':
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 4cc21c94d3..f264513916 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -18,7 +18,7 @@ def set_options(opt):
     opt.recurse(LIBREPLACE_DIR)
 
 def configure(conf):
-    conf.DIST_DIRS('lib/talloc:. buildtools:buildtools')
+    conf.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools')
     conf.sub_config(LIBREPLACE_DIR)
 
     if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index d16516b8b5..87bdcdf79d 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
-VERSION='1.2.1'
+APPNAME = 'tdb'
+VERSION = '1.2.1'
 
 srcdir = '../..'
 blddir = 'bin'
@@ -18,6 +19,7 @@ def set_options(opt):
     opt.recurse(LIBREPLACE_DIR)
 
 def configure(conf):
+    conf.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools')
     conf.sub_config(LIBREPLACE_DIR)
 
     if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION,
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 30db216de1..1298eb4588 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+APPNAME = 'tevent'
 VERSION = '0.9.8'
 
 srcdir = '../..'
@@ -19,6 +20,7 @@ def set_options(opt):
     opt.recurse(LIBTALLOC_DIR)
 
 def configure(conf):
+    conf.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools')
     conf.sub_config(LIBREPLACE_DIR)
     conf.sub_config(LIBTALLOC_DIR)
 
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index de70fa454a..311672fe28 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+APPNAME = 'ldb'
 VERSION = '0.9.10'
 
 srcdir = '../../..'
@@ -21,6 +22,8 @@ def set_options(opt):
     opt.recurse(LIBTEVENT_DIR)
 
 def configure(conf):
+    conf.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
+                      lib/tdb:lib/tdb lib/tevent:lib/tevent buildtools:buildtools''')
     conf.sub_config(LIBTDB_DIR)
     conf.sub_config(LIBTEVENT_DIR)
     conf.sub_config(LIBPOPT_DIR)