From 358c8ec292868b8674577b41e46fc447e657b396 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 7 Jan 2011 12:08:54 +0100
Subject: s3-waf: rearrange waf recurses in main wscript_build.

Guenther
---
 source3/wscript_build | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'source3')

diff --git a/source3/wscript_build b/source3/wscript_build
index 3e261f5d43..ae0eccc128 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -695,15 +695,9 @@ samba_version.load_version(bld.env)
 bld.SAMBA_MKVERSION('include/version.h')
 
 bld.RECURSE('../lib/replace')
-bld.RECURSE('../libcli/smbreadline')
 print "SBINDIR=%s" % bld.env.SBINDIR
 bld.RECURSE('build')
 
-bld.RECURSE('../librpc')
-bld.RECURSE('librpc/idl')
-bld.RECURSE('librpc')
-bld.RECURSE('../libcli/security')
-
 ######################## SUBSYSTEMS #################################
 
 bld.SAMBA_SUBSYSTEM('winbind-client',
@@ -1468,33 +1462,38 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
 
 ########################## INCLUDES #################################
 
-bld.RECURSE('../lib/socket_wrapper')
-bld.RECURSE('../lib/talloc')
-bld.RECURSE('../lib/tdb')
-bld.RECURSE('../lib/nss_wrapper')
-bld.RECURSE('../lib/tevent')
-bld.RECURSE('../lib/popt')
-bld.RECURSE('../lib/zlib')
-bld.RECURSE('../lib/tsocket')
-bld.RECURSE('../lib/iniparser/src')
-bld.RECURSE('../lib/crypto')
-bld.RECURSE('../lib/async_req')
 bld.RECURSE('../lib/addns')
-bld.RECURSE('../lib/smbconf')
+bld.RECURSE('../lib/async_req')
 bld.RECURSE('../libcli/auth')
 bld.RECURSE('../libcli/drsuapi')
-bld.RECURSE('../libcli/samsync')
+bld.RECURSE('../libcli/ldap')
 bld.RECURSE('../libcli/named_pipe_auth')
+bld.RECURSE('../libcli/samsync')
+bld.RECURSE('../libcli/security')
 bld.RECURSE('../libcli/smb')
-bld.RECURSE('../libcli/ldap')
+bld.RECURSE('../libcli/smbreadline')
+bld.RECURSE('../lib/crypto')
+bld.RECURSE('../lib/iniparser/src')
+bld.RECURSE('../lib/nss_wrapper')
+bld.RECURSE('../lib/popt')
+bld.RECURSE('../librpc')
+bld.RECURSE('../lib/smbconf')
+bld.RECURSE('../lib/socket_wrapper')
+bld.RECURSE('../lib/talloc')
+bld.RECURSE('../lib/tdb')
+bld.RECURSE('../lib/tevent')
+bld.RECURSE('../lib/tsocket')
+bld.RECURSE('../lib/zlib')
 bld.RECURSE('../nsswitch/libwbclient')
-bld.RECURSE('modules')
 bld.RECURSE('auth')
-bld.RECURSE('passdb')
-bld.RECURSE('winbindd')
 bld.RECURSE('libgpo/gpext')
+bld.RECURSE('librpc')
+bld.RECURSE('librpc/idl')
+bld.RECURSE('modules')
 bld.RECURSE('pam_smbpass')
+bld.RECURSE('passdb')
 bld.RECURSE('rpc_server')
+bld.RECURSE('winbindd')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()
-- 
cgit