lib/compression: add shared wscript_build.
[sfrench/samba-autobuild/.git] / source3 / wscript_build
index 9d87361fca6ed9fad1f373838d410c82c484b11d..fde1d175a654faf042fee4ef745a7eaa625f8467 100644 (file)
@@ -34,13 +34,7 @@ COMPRESSION_SRC = '../lib/compression/mszip.c'
 
 DRSUAPI_SRC = '''${COMPRESSION_SRC}'''
 
-LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
-             ../librpc/ndr/ndr.c
-             ../librpc/ndr/ndr_misc.c
-             ../librpc/gen_ndr/ndr_misc.c
-             ../librpc/ndr/ndr_string.c
-             ../librpc/ndr/uuid.c
-             librpc/ndr/util.c'''
+LIBNDR_SRC = '''librpc/ndr/util.c'''
 
 LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
                      rpc_client/init_spoolss.c'''
@@ -49,7 +43,10 @@ LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c'''
 
 LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
 
-LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c'
+LIBRPCCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
+
+LIBCLI_WINREG_SRC = '''rpc_client/cli_winreg.c
+                       rpc_client/cli_winreg_int.c'''
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
@@ -86,6 +83,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
           lib/util_sconn.c
           lib/serverid.c
           lib/util_transfer_file.c
+          lib/addrchange.c
           ${TDB_LIB_SRC}
           lib/debug.c lib/fault.c
           lib/interface.c lib/pidfile.c
@@ -103,7 +101,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
           lib/ms_fnmatch.c lib/errmap_unix.c
           lib/tallocmsg.c lib/dmallocmsg.c
           libsmb/clisigning.c libsmb/smb_signing.c
-          lib/pam_errors.c intl/lang_tdb.c
+          intl/lang_tdb.c
           lib/conn_tdb.c lib/adt_tree.c lib/gencache.c
           lib/sessionid_tdb.c
           lib/module.c lib/events.c ${LIBTEVENT_SRC0}
@@ -147,8 +145,6 @@ LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
 SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
                  passdb/machine_sid.c'''
 
-LIBNBT_SRC = '''../libcli/netlogon.c'''
-
 LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
              libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
              libads/dns.c libads/sitename_cache.c'''
@@ -246,8 +242,6 @@ REG_SMBCONF_SRC = '''
                   registry/reg_util_token.c
                   registry/reg_api_util.c'''
 
-REG_EVENTLOG_SRC = '''registry/reg_eventlog.c'''
-
 REG_FULL_SRC = '''
                ${REG_BACKENDS_EXTRA_SRC}
                ${REG_INIT_FULL_SRC}
@@ -255,7 +249,7 @@ REG_FULL_SRC = '''
 
 SERVICES_SRC = '''services/svc_spoolss.c
                   services/svc_rcinit.c
-                  services/services_db.c
+                  services/svc_winreg_glue.c
                   services/svc_netlogon.c
                   services/svc_winreg.c
                   services/svc_wins.c'''
@@ -561,9 +555,7 @@ CLIENT_SRC1 = '''client/client.c client/clitar.c
 
 CLIENT_SRC = '''${CLIENT_SRC1}'''
 
-LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c
-                    ../lib/smbconf/smbconf_txt.c lib/smbconf/smbconf_reg.c
-                    lib/smbconf/smbconf_init.c'''
+LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
 
 SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
 
@@ -573,6 +565,7 @@ LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c'
 
 
 LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
+                       libnet/libnet_dssync_passdb.c
                        libnet/libnet_dssync_keytab.c'''
 
 LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
@@ -614,6 +607,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
                 torture/denytest.c torture/mangle_test.c
                 torture/nbench.c
                 torture/test_async_echo.c
+                torture/test_addrchange.c
                 torture/test_posix_append.c
                 torture/test_smbsock_any_connect.c'''
 
@@ -658,14 +652,6 @@ WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
 
 WBINFO_SRC = '''../nsswitch/wbinfo.c'''
 
-WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}'''
-
-WINBIND_KRB5_LOCATOR_SRC1 = '../nsswitch/winbind_krb5_locator.c'
-WINBIND_KRB5_LOCATOR_SRC = '''${WINBIND_KRB5_LOCATOR_SRC1} ${LIBREPLACE_SRC}'''
-
-POPT_SRC = '''../lib/popt/findme.c ../lib/popt/popt.c ../lib/popt/poptconfig.c \
-          ../lib/popt/popthelp.c ../lib/popt/poptparse.c'''
-
 NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
 
 NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
@@ -705,15 +691,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',
@@ -726,27 +706,27 @@ bld.SAMBA_LIBRARY('netapi',
                     public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT
                     PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
-                    RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF TOKEN_UTIL
-                    LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
-                    RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_INITSHUTDOWN
+                    RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL
+                    LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
+                    RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
                     INIT_NETLOGON INIT_SAMR''',
                     public_headers='lib/netapi/netapi.h',
-                    private_library=True,
+                    vnum='0',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('smbclient',
                     source=LIBSMBCLIENT_SRC,
                     public_deps='''talloc tdb wbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
-                    LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPCCLI_SRVSVC''',
+                    LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPC_NDR_SRVSVC''',
                     public_headers='include/libsmbclient.h',
-                    private_library=True,
+                    vnum='0',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('smbsharemodes',
                     source=LIBSMBSHAREMODES_SRC,
                     public_deps='''talloc tdb''',
                     public_headers='include/smb_share_modes.h',
-                    private_library=True,
+                    vnum='0',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('nss_winbind',
@@ -773,12 +753,12 @@ if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
         bld.SAMBA_LIBRARY('winbind_krb5_locator',
                           source='../nsswitch/winbind_krb5_locator.c',
                           deps='wbclient krb5',
-                          vnum='0')
+                          realname='winbind_krb5_locator.so')
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC',
                     source='${LIBMSRPC_SRC}',
-                    deps='''ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
-                    RPCCLI_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH''',
+                    deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
+                    RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH''',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
@@ -823,7 +803,7 @@ bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
 
 bld.SAMBA_SUBSYSTEM('PARAM',
                     source='',
-                    deps='PARAM_WITHOUT_REG DYNCONFIG LIBSMBCONF',
+                    deps='PARAM_WITHOUT_REG DYNCONFIG LIB_SMBCONF',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('REGFIO',
@@ -845,11 +825,7 @@ bld.SAMBA_SUBSYSTEM('REG_SMBCONF',
 
 bld.SAMBA_SUBSYSTEM('REG_FULL',
                     source=REG_FULL_SRC,
-                    deps='REG_SMBCONF REG_EVENTLOG',
-                    vars=locals())
-
-bld.SAMBA_SUBSYSTEM('REG_EVENTLOG',
-                    source=REG_EVENTLOG_SRC,
+                    deps='REG_SMBCONF',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
@@ -863,7 +839,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
-                    deps='LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB SAMBA_VERSION',
+                    deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB SAMBA_VERSION',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -928,9 +904,9 @@ bld.SAMBA_SUBSYSTEM('LIBAFS_SETTOKEN',
                     source=AFS_SETTOKEN_SRC,
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
-                    source=LIBSMBCONF_SRC,
-                    deps='REG_BASE REG_SMBCONF',
+bld.SAMBA_SUBSYSTEM('LIB_SMBCONF',
+                    source=LIB_SMBCONF_SRC,
+                    deps='LIBSMBCONF REG_BASE REG_SMBCONF',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SMBD_BASE',
@@ -941,9 +917,9 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
                     vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
                     PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
-                    LIBSMBCONF REG_FULL FNAME_UTIL
-                    LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
-                    RPCCLI_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR
+                    LIB_SMBCONF REG_FULL FNAME_UTIL
+                    LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+                    RPC_NDR_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR
                     LIBCLI_SMB_COMMON RPC_SERVER
                     ''',
                     vars=locals())
@@ -1009,8 +985,8 @@ bld.SAMBA_SUBSYSTEM('LIBNMB',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBNBT',
-                    source=LIBNBT_SRC,
-                    deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NDR_NETLOGON',
+                    source='',
+                    deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NETLOGON LIBCLI_NDR_NETLOGON',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SERVICES',
@@ -1019,7 +995,7 @@ bld.SAMBA_SUBSYSTEM('SERVICES',
 
 bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH',
                     source=PLAINTEXT_AUTH_SRC,
-                    deps='pam',
+                    deps='pam PAM_ERRORS',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('PASSCHANGE',
@@ -1043,7 +1019,7 @@ bld.SAMBA_SUBSYSTEM('DCUTIL',
                     source=DCUTIL_SRC,
                     vars=locals())
 
-bld.SAMBA_SUBSYSTEM('ndr',
+bld.SAMBA_SUBSYSTEM('ndr-util',
                     source=LIBNDR_SRC,
                     vars=locals())
 
@@ -1076,10 +1052,6 @@ bld.SAMBA_SUBSYSTEM('dcerpc', '')
 bld.SAMBA_SUBSYSTEM('ldb',
                     source='lib/ldb_compat.c')
 
-bld.SAMBA_SUBSYSTEM('LZXPRESS',
-                   deps='replace',
-                   source='../lib/compression/lzxpress.c')
-
 bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
                     source='''../librpc/gen_ndr/ndr_security.c ../librpc/ndr/ndr_sec_helper.c''',
                     deps='ndr',
@@ -1097,89 +1069,25 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
        deps='talloc',
        autoproto='nbtname.h')
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
-       source='../libcli/ndr_netlogon.c',
-       public_deps='ndr NDR_SECURITY')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_WINREG',
-       source='../librpc/gen_ndr/cli_winreg.c',
-       public_deps='RPC_NDR_WINREG')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_ECHO',
-       source='../librpc/gen_ndr/cli_echo.c',
-       public_deps='RPC_NDR_ECHO')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SAMR',
-       source='../librpc/gen_ndr/cli_samr.c',
-       public_deps='RPC_NDR_SAMR')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_LSA',
-       source='../librpc/gen_ndr/cli_lsa.c',
-       public_deps='RPC_NDR_LSA')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_NETLOGON',
-       source='../librpc/gen_ndr/cli_netlogon.c',
-       public_deps='RPC_NDR_NETLOGON')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SRVSVC',
-       source='../librpc/gen_ndr/cli_srvsvc.c',
-       public_deps='RPC_NDR_SRVSVC')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_INITSHUTDOWN',
-       source='../librpc/gen_ndr/cli_initshutdown.c',
-       public_deps='RPC_NDR_INITSHUTDOWN')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_WKSSVC',
-       source='../librpc/gen_ndr/cli_wkssvc.c',
-       public_deps='RPC_NDR_WKSSVC')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SVCCTL',
-       source='../librpc/gen_ndr/cli_svcctl.c',
-       public_deps='RPC_NDR_SVCCTL')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_DSSETUP',
-       source='../librpc/gen_ndr/cli_dssetup.c',
-       public_deps='RPC_NDR_DSSETUP')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_DFS',
-       source='../librpc/gen_ndr/cli_dfs.c',
-       public_deps='RPC_NDR_DFS')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_DRSUAPI',
-       source='../librpc/gen_ndr/cli_drsuapi.c',
-       public_deps='RPC_NDR_DRSUAPI')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_NTSVCS',
-       source='../librpc/gen_ndr/cli_ntsvcs.c',
-       public_deps='RPC_NDR_NTSVCS')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_EVENTLOG',
-       source='../librpc/gen_ndr/cli_eventlog.c',
-       public_deps='RPC_NDR_EVENTLOG')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_EPMAPPER',
-       source='../librpc/gen_ndr/cli_epmapper.c',
-       public_deps='RPC_NDR_EPMAPPER')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SPOOLSS',
-       source='../librpc/gen_ndr/cli_spoolss.c',
-       public_deps='RPC_NDR_SPOOLSS')
-
 bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
                     source=LIBCLI_SAMR_SRC,
-                    deps='RPCCLI_SAMR')
+                    deps='RPC_NDR_SAMR')
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
                     source=LIBCLI_LSA_SRC,
-                    deps='RPCCLI_LSA INIT_LSA')
+                    deps='RPC_NDR_LSA INIT_LSA')
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
-                    source=LIBCLI_NETLOGON_SRC,
-                    deps='RPCCLI_NETLOGON')
+bld.SAMBA_SUBSYSTEM('LIBRPCCLI_NETLOGON',
+                    source=LIBRPCCLI_NETLOGON_SRC,
+                    deps='RPC_NDR_NETLOGON')
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
                     source=LIBCLI_SPOOLSS_SRC,
-                    deps='RPCCLI_SPOOLSS')
+                    deps='RPC_NDR_SPOOLSS')
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_WINREG',
+                    source=LIBCLI_WINREG_SRC,
+                    deps='RPC_NDR_WINREG')
 
 bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
        source=RPC_CLIENT_SCHANNEL_SRC,
@@ -1218,9 +1126,10 @@ bld.SAMBA_BINARY('winbindd/winbindd',
                  SRV_NDR_WBINT RPC_NDR_WBINT LIBAFS
                  LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
                  TOKEN_UTIL
-                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
-                 RPCCLI_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
+                 LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
+                 RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
                  RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
+                 PAM_ERRORS
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',
@@ -1240,11 +1149,11 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
                  source=RPCCLIENT_SRC,
                  deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
-                 LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
+                 LIBADS SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO
                  RPC_CLIENT_SCHANNEL
-                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
-                 RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP RPCCLI_DFS
-                 RPCCLI_DRSUAPI RPCCLI_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON
+                 LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+                 RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS
+                 RPC_NDR_DRSUAPI RPC_NDR_NTSVCS RPC_NDR_EVENTLOG INIT_NETLOGON
                  INIT_SAMR
                  ''',
                  vars=locals())
@@ -1253,7 +1162,7 @@ bld.SAMBA_BINARY('client/smbclient',
                  source=CLIENT_SRC,
                  deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN
-                 LIBMSRPC SMBREADLINE smbclient RPCCLI_SRVSVC INIT_LSA''',
+                 LIBMSRPC SMBREADLINE smbclient RPC_NDR_SRVSVC INIT_LSA''',
                  vars=locals())
 
 bld.SAMBA_BINARY('net',
@@ -1262,11 +1171,11 @@ bld.SAMBA_BINARY('net',
                  PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBGPO LIBADS LIBADS_SERVER LIBADS_PRINTER
                  LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
                  LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
-                 REGFIO NDR_NTPRINTING RPCCLI_WINREG
+                 REGFIO NDR_NTPRINTING RPC_NDR_WINREG
                  RPC_CLIENT_SCHANNEL TOKEN_UTIL
-                 LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
-                 RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP
-                 RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI INIT_NETLOGON INIT_SAMR
+                 LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+                 RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_SVCCTL RPC_NDR_DSSETUP
+                 RPC_NDR_INITSHUTDOWN RPC_NDR_DRSUAPI INIT_NETLOGON INIT_SAMR
                 ''',
                  vars=locals())
 
@@ -1309,7 +1218,7 @@ bld.SAMBA_BINARY('smbtree',
                  source=SMBTREE_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
                  LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PROFILE
-                 RPCCLI_SRVSVC''',
+                 RPC_NDR_SRVSVC''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbpasswd',
@@ -1339,7 +1248,7 @@ bld.SAMBA_BINARY('nmblookup',
 bld.SAMBA_BINARY('smbtorture',
                  source=SMBTORTURE_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient PARAM LIBSMB KRBCLIENT TLDAP
-                 LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPCCLI_ECHO''',
+                 LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbconftort',
@@ -1375,7 +1284,7 @@ bld.SAMBA_BINARY('smbcquotas',
 bld.SAMBA_BINARY('eventlogadm',
                  source=EVTLOGADM_SRC,
                  deps='''talloc tevent cap POPT_SAMBA LIBS PARAM
-                 LIB_NONSMBD LIBSMB_ERR PASSDB wbclient LIBEVENTLOG REG_EVENTLOG''',
+                 LIB_NONSMBD LIBSMB_ERR PASSDB wbclient LIBEVENTLOG''',
                  vars=locals())
 
 bld.SAMBA_BINARY('sharesec',
@@ -1494,32 +1403,39 @@ 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/addns')
 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/netlogon')
+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('libaddns')
+bld.RECURSE('winbindd')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()