diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-04 13:08:05 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:25 +1000 |
| commit | 553324bc1022635e05a683c4bec5135d845f6fea (patch) | |
| tree | 7d8aa296c7e433793e47bf1227310973a4aed7e9 /source4/lib/ldb | |
| parent | 8dc8d31f4adf84f35bce34339e13e9d70c4b8a66 (diff) | |
| download | samba-553324bc1022635e05a683c4bec5135d845f6fea.tar.gz samba-553324bc1022635e05a683c4bec5135d845f6fea.tar.bz2 samba-553324bc1022635e05a683c4bec5135d845f6fea.zip | |
s4-waf: move to a universal method of recursing into subdirs
This works with both standalone lib builds and bundled builds
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/wscript | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 968485f69f..9d3eddfc99 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -26,13 +26,13 @@ LIBPOPT_DIR= '../../../lib/popt' def set_options(opt): opt.BUILTIN_DEFAULT('replace') opt.BUNDLED_EXTENSION_DEFAULT('ldb', noextenion='ldb') - opt.recurse(LIBTDB_DIR) - opt.recurse(LIBTEVENT_DIR) + opt.RECURSE(LIBTDB_DIR) + opt.RECURSE(LIBTEVENT_DIR) def configure(conf): - conf.sub_config(LIBTDB_DIR) - conf.sub_config(LIBTEVENT_DIR) - conf.sub_config(LIBPOPT_DIR) + conf.RECURSE(LIBTDB_DIR) + conf.RECURSE(LIBTEVENT_DIR) + conf.RECURSE(LIBPOPT_DIR) # where does the default LIBDIR end up? in conf.env somewhere? # conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb') @@ -53,9 +53,9 @@ def configure(conf): conf.SAMBA_CONFIG_H() def build(bld): - bld.BUILD_SUBDIR(LIBTDB_DIR) - bld.BUILD_SUBDIR(LIBTEVENT_DIR) - bld.BUILD_SUBDIR(LIBPOPT_DIR) + bld.RECURSE(LIBTDB_DIR) + bld.RECURSE(LIBTEVENT_DIR) + bld.RECURSE(LIBPOPT_DIR) # in Samba4 we build some extra modules, and add extra # capabilities to the ldb cmdline tools |