# we don't always use consistent names for our subsystems.
# this sets up some aliases
bld.TARGET_ALIAS('attr', 'XATTR')
-bld.TARGET_ALIAS('execinfo', 'EXECINFO')
bld.TARGET_ALIAS('tevent', 'LIBTEVENT_EXT')
-bld.TARGET_ALIAS('z', 'ZLIB')
-bld.TARGET_ALIAS('pam', 'PAM')
bld.TARGET_ALIAS('sasl2', 'SASL')
-bld.TARGET_ALIAS('crypt', 'CRYPT')
bld.TARGET_ALIAS('RPC_NDR_SRVSVC', 'NDR_SRVSVC')
bld.TARGET_ALIAS('RPC_NDR_MGMT', 'dcerpc_mgmt')
-bld.TARGET_ALIAS('iconv', 'ICONV')
# missing subsystems - need looking at
-bld.SAMBA_SUBSYSTEM('pyldb_util', '')
-bld.SAMBA_SUBSYSTEM('TORTURE_LDB_MODULE', '')
-bld.SAMBA_SUBSYSTEM('INTL', '')
-bld.SAMBA_SUBSYSTEM('NETAPI', '')
-bld.SAMBA_SUBSYSTEM('HDB_LDB', '')
-bld.SAMBA_SUBSYSTEM('OPENPTY', '')
-bld.SAMBA_SUBSYSTEM('SMBCLIENT', '')
-bld.SAMBA_SUBSYSTEM('BLKID', '')
-bld.SAMBA_SUBSYSTEM('smbcalls', '')
-bld.SAMBA_SUBSYSTEM('SETPROCTITLE', '')
-bld.SAMBA_SUBSYSTEM('DCOM_PROXY_DCOM', '')
+bld.SAMBA_SUBSYSTEM('INTL', '') # external gettext library
+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
+# 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.BUILD_SUBDIR('../lib/replace')
bld.BUILD_SUBDIR('../lib/tsocket')
bld.BUILD_SUBDIR('../lib/crypto')
bld.BUILD_SUBDIR('../lib/torture')
+bld.BUILD_SUBDIR('../lib/zlib')
bld.BUILD_SUBDIR('lib')
bld.BUILD_SUBDIR('lib/com')
bld.BUILD_SUBDIR('smb_server')
bld.BUILD_SUBDIR('heimdal_build')
bld.BUILD_SUBDIR('lib/smbreadline')
bld.BUILD_SUBDIR('../codepages')
-
-bld.ENFORCE_GROUP_ORDERING()
-
+bld.BUILD_SUBDIR('setup')
+bld.BUILD_SUBDIR('scripting')
+bld.BUILD_SUBDIR('../pidl')