From 553324bc1022635e05a683c4bec5135d845f6fea Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 4 Apr 2010 13:08:05 +1000 Subject: s4-waf: move to a universal method of recursing into subdirs This works with both standalone lib builds and bundled builds --- source3/wscript_build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source3/wscript_build') 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() -- cgit