From 553324bc1022635e05a683c4bec5135d845f6fea Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
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       | 26 +++++++++++++-------------
 source3/wscript_build | 14 +++++++-------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'source3')

diff --git a/source3/wscript b/source3/wscript
index ac231d4ed3..6b669dbd42 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -12,11 +12,11 @@ from samba_utils import *
 def set_options(opt):
     opt.BUILTIN_DEFAULT('NONE')
     opt.BUNDLED_EXTENSION_DEFAULT('s3')
-    opt.recurse('../lib/replace')
-    opt.recurse('build')
-    opt.recurse('../lib/nss_wrapper')
-    opt.recurse('../lib/socket_wrapper')
-    opt.recurse('../lib/uid_wrapper')
+    opt.RECURSE('../lib/replace')
+    opt.RECURSE('build')
+    opt.RECURSE('../lib/nss_wrapper')
+    opt.RECURSE('../lib/socket_wrapper')
+    opt.RECURSE('../lib/uid_wrapper')
 
     opt.add_option('--with-static-modules',
                    help=("Comma-separated list of names of modules to statically link in"),
@@ -45,14 +45,14 @@ def configure(conf):
 
     conf.ADD_EXTRA_INCLUDES('#source3 #source3/include #lib/replace #lib/talloc #lib/tevent #source3/libaddns #source3/librpc')
 
-    conf.sub_config('../lib/replace')
-    conf.sub_config('build')
-    conf.sub_config('../lib/tdb')
-    conf.sub_config('../lib/talloc')
-    conf.sub_config('../lib/tevent')
-    conf.sub_config('../lib/nss_wrapper')
-    conf.sub_config('../lib/socket_wrapper')
-    conf.sub_config('../lib/uid_wrapper')
+    conf.RECURSE('../lib/replace')
+    conf.RECURSE('build')
+    conf.RECURSE('../lib/tdb')
+    conf.RECURSE('../lib/talloc')
+    conf.RECURSE('../lib/tevent')
+    conf.RECURSE('../lib/nss_wrapper')
+    conf.RECURSE('../lib/socket_wrapper')
+    conf.RECURSE('../lib/uid_wrapper')
 
     conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h')
 
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