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/wscript | |
| 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/wscript')
| -rw-r--r-- | source4/wscript | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/source4/wscript b/source4/wscript index 36796d6333..fea5831047 100644 --- a/source4/wscript +++ b/source4/wscript @@ -19,16 +19,16 @@ Options.default_prefix = '/usr/local/samba' def set_options(opt): opt.BUILTIN_DEFAULT('NONE') opt.BUNDLED_EXTENSION_DEFAULT('samba4') - opt.recurse('../lib/replace') - opt.recurse('dynconfig') - opt.recurse('scripting/python') - opt.recurse('lib/ldb') - opt.recurse('selftest') - opt.recurse('lib/tls') - opt.recurse('../lib/nss_wrapper') - opt.recurse('../lib/socket_wrapper') - opt.recurse('../lib/uid_wrapper') - opt.recurse('../pidl') + opt.RECURSE('../lib/replace') + opt.RECURSE('dynconfig') + opt.RECURSE('scripting/python') + opt.RECURSE('lib/ldb') + opt.RECURSE('selftest') + opt.RECURSE('lib/tls') + opt.RECURSE('../lib/nss_wrapper') + opt.RECURSE('../lib/socket_wrapper') + opt.RECURSE('../lib/uid_wrapper') + opt.RECURSE('../pidl') def configure(conf): conf.DEFINE('PACKAGE_NAME', 'samba', quote=True) @@ -50,7 +50,7 @@ def configure(conf): conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include') - conf.sub_config('../lib/replace') + conf.RECURSE('../lib/replace') conf.find_program('python', var='PYTHON', mandatory=True) conf.find_program('perl', var='PERL', mandatory=True) @@ -60,23 +60,23 @@ def configure(conf): conf.check_python_version((2,4,2)) conf.check_python_headers() - conf.sub_config('dynconfig') - conf.sub_config('scripting/python') - conf.sub_config('lib/ldb') - conf.sub_config('heimdal_build') - conf.sub_config('lib/tls') - conf.sub_config('ntvfs/sysdep') - conf.sub_config('../lib/util') - conf.sub_config('../lib/zlib') - conf.sub_config('../lib/util/charset') - conf.sub_config('auth') - conf.sub_config('../lib/nss_wrapper') - conf.sub_config('../nsswitch') - conf.sub_config('../lib/socket_wrapper') - conf.sub_config('../lib/uid_wrapper') - conf.sub_config('../lib/popt') - conf.sub_config('lib/smbreadline') - conf.sub_config('../pidl') + conf.RECURSE('dynconfig') + conf.RECURSE('scripting/python') + conf.RECURSE('lib/ldb') + conf.RECURSE('heimdal_build') + conf.RECURSE('lib/tls') + conf.RECURSE('ntvfs/sysdep') + conf.RECURSE('../lib/util') + conf.RECURSE('../lib/zlib') + conf.RECURSE('../lib/util/charset') + conf.RECURSE('auth') + conf.RECURSE('../lib/nss_wrapper') + conf.RECURSE('../nsswitch') + conf.RECURSE('../lib/socket_wrapper') + conf.RECURSE('../lib/uid_wrapper') + conf.RECURSE('../lib/popt') + conf.RECURSE('lib/smbreadline') + conf.RECURSE('../pidl') # we don't want PYTHONDIR in config.h, as otherwise changing # --prefix causes a complete rebuild |