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
---
 lib/tevent/wscript | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/tevent/wscript')

diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index cc139ccee5..569740e8d0 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -25,12 +25,12 @@ LIBTALLOC_DIR=  '../talloc'
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
     opt.BUNDLED_EXTENSION_DEFAULT('tevent', noextenion='tevent')
-    opt.recurse(LIBREPLACE_DIR)
-    opt.recurse(LIBTALLOC_DIR)
+    opt.RECURSE(LIBREPLACE_DIR)
+    opt.RECURSE(LIBTALLOC_DIR)
 
 def configure(conf):
-    conf.sub_config(LIBREPLACE_DIR)
-    conf.sub_config(LIBTALLOC_DIR)
+    conf.RECURSE(LIBREPLACE_DIR)
+    conf.RECURSE(LIBTALLOC_DIR)
 
     if conf.CHECK_BUNDLED_SYSTEM('tevent', minversion=VERSION,
                                  onlyif='talloc', implied_deps='replace talloc'):
@@ -42,8 +42,8 @@ def configure(conf):
     conf.SAMBA_CONFIG_H()
 
 def build(bld):
-    bld.BUILD_SUBDIR(LIBREPLACE_DIR)
-    bld.BUILD_SUBDIR(LIBTALLOC_DIR)
+    bld.RECURSE(LIBREPLACE_DIR)
+    bld.RECURSE(LIBTALLOC_DIR)
 
     SRC = '''tevent.c tevent_debug.c tevent_fd.c tevent_immediate.c
              tevent_queue.c tevent_req.c tevent_select.c
-- 
cgit