s4-waf: removed the XATTR and SASL aliases

[abartlet/samba.git/.git] / source4 / wscript_build

diff --git a/source4/wscript_build b/source4/wscript_build
index 788fdba2a5b5f92cedfa68bda0f224444aa5b90e..7fd6ee89b6c8a8ff18836776cbf4808754df638a 100644 (file)
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -8,38 +8,12 @@ srcdir = ".."
 # create separate build groups for building the asn1 and et compiler, then
 # building the C from ASN1 and IDL, and finally the main build process
 bld.SETUP_BUILD_GROUPS()
+bld.AUTOCLEANUP_STALE_FILES()
 
 bld.SAMBA_MKVERSION('version.h')
 
 # bld.ENABLE_MAGIC_ORDERING()
 
-# we don't always use consistent names for our subsystems.
-# this sets up some aliases
-bld.TARGET_ALIAS('attr', 'XATTR')
-bld.TARGET_ALIAS('sasl2', 'SASL')
-bld.TARGET_ALIAS('RPC_NDR_SRVSVC', 'NDR_SRVSVC')
-bld.TARGET_ALIAS('RPC_NDR_MGMT', 'dcerpc_mgmt')
-
-# missing subsystems - need looking at
-bld.SAMBA_SUBSYSTEM('NETAPI', '')       # for external libnet
-bld.SAMBA_SUBSYSTEM('OPENPTY', '')      # external openpty library
-bld.SAMBA_SUBSYSTEM('SMBCLIENT', '')    # for external libsmbclient
-bld.SAMBA_SUBSYSTEM('BLKID', '')        # blkid library from e2fsprogs
-bld.SAMBA_SUBSYSTEM('SETPROCTITLE', '') # external setproctitle library
-
-# subsystems that are confirmed to be missing. These should
-# be removed from the build completely when we only have
-# one build system
-bld.SAMBA_SUBSYSTEM('DCOM_PROXY_DCOM', '')
-bld.SAMBA_SUBSYSTEM('smbcalls', '')
-bld.SAMBA_SUBSYSTEM('HDB_LDB', '')
-bld.SAMBA_SUBSYSTEM('NDR_MISC', '')
-bld.SAMBA_SUBSYSTEM('NDR_SAMR', '')
-bld.SAMBA_SUBSYSTEM('SCHANNELDB', '')
-bld.SAMBA_SUBSYSTEM('pyldb_util', '')
-bld.SAMBA_SUBSYSTEM('TORTURE_LDB_MODULE', '')
-
-
 bld.RECURSE('../lib/replace')
 bld.RECURSE('../lib/talloc')
 bld.RECURSE('../lib/tdb')
@@ -56,6 +30,7 @@ bld.RECURSE('cluster')
 bld.RECURSE('smbd')
 bld.RECURSE('libnet')
 bld.RECURSE('auth')
+bld.RECURSE('../lib/iniparser/src')
 bld.RECURSE('../nsswitch')
 bld.RECURSE('../nsswitch/libwbclient')
 bld.RECURSE('lib/samba3')
@@ -98,6 +73,7 @@ bld.RECURSE('client')
 bld.RECURSE('libcli')
 bld.RECURSE('../libcli/smb')
 bld.RECURSE('../libcli/cldap')
+bld.RECURSE('../lib/subunit/c')
 bld.RECURSE('kdc')
 bld.RECURSE('../lib/smbconf')
 bld.RECURSE('../lib/async_req')
@@ -107,10 +83,10 @@ bld.RECURSE('../libcli/nbt')
 bld.RECURSE('../libcli/auth')
 bld.RECURSE('../libcli/drsuapi')
 bld.RECURSE('../libcli/samsync')
-bld.RECURSE('../libgpo')
+bld.RECURSE('lib/policy')
 bld.RECURSE('../libcli/named_pipe_auth')
 bld.RECURSE('heimdal_build')
-bld.RECURSE('lib/smbreadline')
+bld.RECURSE('../libcli/smbreadline')
 bld.RECURSE('../codepages')
 bld.RECURSE('setup')
 bld.RECURSE('scripting')
@@ -118,4 +94,4 @@ bld.RECURSE('../pidl')
 bld.RECURSE('../lib')
 
 # install some extra empty directories
-bld.INSTALL_DIRS("${PREFIX}", "etc var/lib var/locks var/run")
+bld.INSTALL_DIRS("", "${LOCKDIR} ${SYSCONFDIR} ${LOCKDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging")