diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-04 11:00:42 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:25 +1000 |
| commit | 1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7 (patch) | |
| tree | aadeca78d8c2cb90afb691293fa5a1d6d7d15c0f /source4 | |
| parent | 3ed6d7e76f9e2936e2d27ceeee8984950ea900a3 (diff) | |
| download | samba-1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7.tar.gz samba-1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7.tar.bz2 samba-1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7.zip | |
s4-waf: avoid having to run waf configure before waf dist
This should be useful for building tarballs from a clean checkout
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/wscript | 7 | ||||
| -rw-r--r-- | source4/wscript | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index ddd5e138c4..4e8b80515d 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -14,7 +14,10 @@ for d in buildtools.split(): break sys.path.insert(0, srcdir+"/buildtools/wafsamba") -import wafsamba +import wafsamba, samba_dist + +samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc + lib/tdb:lib/tdb lib/tevent:lib/tevent buildtools:buildtools''') LIBTDB_DIR= srcdir + '/lib/tdb' @@ -28,8 +31,6 @@ 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) diff --git a/source4/wscript b/source4/wscript index 816093e293..36796d6333 100644 --- a/source4/wscript +++ b/source4/wscript @@ -10,6 +10,8 @@ import sys, os sys.path.insert(0, srcdir+"/buildtools/wafsamba") import wafsamba, Options, samba_dist +samba_dist.DIST_DIRS('.') + # install in /usr/local/samba by default Options.default_prefix = '/usr/local/samba' @@ -39,7 +41,6 @@ def configure(conf): conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) conf.DEFINE('_SAMBA_BUILD_', 4, add_to_cflags=True) conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) - conf.DIST_DIRS('.') if Options.options.developer: conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD') |