summaryrefslogtreecommitdiff
path: root/source3/wscript_build
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-04 13:08:05 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:25 +1000
commit553324bc1022635e05a683c4bec5135d845f6fea (patch)
tree7d8aa296c7e433793e47bf1227310973a4aed7e9 /source3/wscript_build
parent8dc8d31f4adf84f35bce34339e13e9d70c4b8a66 (diff)
downloadsamba-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 'source3/wscript_build')
-rw-r--r--source3/wscript_build14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 34d7667325..7b64263549 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -587,9 +587,9 @@ bld.SAMBA_GENERATOR('build_options',
bld.SETUP_BUILD_GROUPS()
-bld.BUILD_SUBDIR('../lib/replace')
+bld.RECURSE('../lib/replace')
print "SBINDIR=%s" % bld.env.SBINDIR
-bld.BUILD_SUBDIR('build')
+bld.RECURSE('build')
bld.SAMBA_MKVERSION('include/version.h')
@@ -598,11 +598,11 @@ bld.SAMBA_BINARY('smbd/smbd',
deps='tdb DYNCONFIG',
vars=locals())
-bld.BUILD_SUBDIR('../lib/socket_wrapper')
-bld.BUILD_SUBDIR('../lib/talloc')
-bld.BUILD_SUBDIR('../lib/tdb')
-bld.BUILD_SUBDIR('../lib/nss_wrapper')
-bld.BUILD_SUBDIR('../lib/uid_wrapper')
+bld.RECURSE('../lib/socket_wrapper')
+bld.RECURSE('../lib/talloc')
+bld.RECURSE('../lib/tdb')
+bld.RECURSE('../lib/nss_wrapper')
+bld.RECURSE('../lib/uid_wrapper')
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()