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 /lib/talloc | |
| parent | 8dc8d31f4adf84f35bce34339e13e9d70c4b8a66 (diff) | |
| download | samba-553324bc1022635e05a683c4bec5135d845f6fea.tar.gz samba-553324bc1022635e05a683c4bec5135d845f6fea.tar.xz 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 'lib/talloc')
| -rw-r--r-- | lib/talloc/wscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index e577643595e..9c6316289e6 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -29,10 +29,10 @@ samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools def set_options(opt): opt.BUILTIN_DEFAULT('replace') opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextenion='talloc') - opt.recurse(LIBREPLACE_DIR) + opt.RECURSE(LIBREPLACE_DIR) def configure(conf): - conf.sub_config(LIBREPLACE_DIR) + conf.RECURSE(LIBREPLACE_DIR) if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, implied_deps='replace'): @@ -45,7 +45,7 @@ def configure(conf): def build(bld): - bld.BUILD_SUBDIR(LIBREPLACE_DIR) + bld.RECURSE(LIBREPLACE_DIR) if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'): bld.SAMBA_LIBRARY('talloc', |