build: netapi does not depend on TOKEN_UTIL

[sfrench/samba-autobuild/.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index 8d4a02f33a9aab549b4f4243240b2309b98fb1ce..9f3eb0502ac2fac147036dd8058176653110bdce 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -55,6 +55,7 @@ REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
 LIB_SRC = '''
           lib/messages.c lib/messages_local.c
           lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c
+          lib/id_cache.c
           lib/talloc_dict.c
           lib/util_sconn.c
           lib/serverid.c
@@ -75,13 +76,14 @@ LIB_SRC = '''
           lib/substitute.c lib/substitute_generic.c
           lib/ms_fnmatch.c
           lib/tallocmsg.c lib/dmallocmsg.c
-          libsmb/clisigning.c libsmb/smb_signing.c
+          libsmb/smb_signing.c
           intl/lang_tdb.c
           lib/conn_tdb.c lib/gencache.c
           lib/sessionid_tdb.c
           lib/module.c lib/events.c
           lib/server_contexts.c
           lib/server_prefork.c
+          lib/server_prefork_util.c
           lib/ldap_escape.c
           lib/fncall.c
           libads/krb5_errs.c lib/system_smbd.c lib/audit.c
@@ -134,7 +136,8 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
              libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
              libsmb/clioplock.c libsmb/clirap2.c
-             libsmb/smb_seal.c libsmb/async_smb.c  libsmb/read_smb.c
+             libsmb/smb_seal.c libsmb/async_smb.c
+             libsmb/read_smb.c libsmb/clisigning.c
              libsmb/smb2cli_base.c
              libsmb/smb2cli_negprot.c
              libsmb/smb2cli_session.c
@@ -374,7 +377,6 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/file_access.c
                smbd/dnsregister.c smbd/globals.c
                smbd/smb2_server.c
-               smbd/smb2_signing.c
                smbd/smb2_glue.c
                smbd/smb2_negprot.c
                smbd/smb2_sesssetup.c
@@ -550,6 +552,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_eventlog.c
               utils/net_printing.c
               utils/net_rpc_trust.c
+             utils/net_rpc_conf.c
               registry/reg_parse.c registry/reg_format.c
               registry/reg_parse_internal.c registry/reg_import.c
               lib/cbuf.c lib/srprs.c'''
@@ -634,10 +637,7 @@ if bld.env.toplevel_build:
 else:
     config_h = "include/config.h"
 
-bld.SAMBA_GENERATOR('build_options',
-                    source= config_h + ' script/mkbuildoptions-waf.awk',
-                    target='smbd/build_options.c',
-                    rule='${AWK} -f ${SRC[1].abspath(env)} > ${TGT} < ${SRC[0].abspath(env)}')
+bld.SAMBA_BLDOPTIONS('smbd/build_options.c')
 
 t = bld.SAMBA_GENERATOR('build_env.h',
                         source='script/build_env.sh',
@@ -665,7 +665,7 @@ bld.SAMBA3_LIBRARY('netapi',
                     public_deps='''talloc tdb_compat cap wbclient smbd_shim libsmb KRBCLIENT
                     pdb SMBLDAP param samba-util
                     LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI
-                    RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF TOKEN_UTIL
+                    RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF
                     LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON
                     RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
                     INIT_NETLOGON INIT_SAMR popt_samba3''',
@@ -713,10 +713,11 @@ bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN',
                     deps='''ndr-standard NDR_DSSETUP NDR_SPOOLSS''',
                     vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('LIBGPO',
-                    source='${LIBGPO_SRC}',
-                    deps='gpext talloc',
-                    vars=locals())
+bld.SAMBA3_LIBRARY('libgpo',
+                   source='${LIBGPO_SRC}',
+                   deps='talloc ads TOKEN_UTIL gpext',
+                   vars=locals(),
+                   private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('AVAHI',
                     source=AVAHI_SRC,
@@ -1117,7 +1118,7 @@ bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
 
 bld.SAMBA3_BINARY('smbd/smbd',
                  source='${SMBD_SRC_MAIN}',
-                 deps='smbd_base EPMD',
+                 deps='smbd_base EPMD LSASD',
                  install_path='${SBINDIR}',
                  vars=locals())
 
@@ -1180,7 +1181,7 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
 bld.SAMBA3_BINARY('net',
                  source=NET_SRC,
                  deps='''talloc tdb_compat netapi addns cap intl popt_samba3 pdb libsmb smbd_shim
-                 param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 LIBGPO ads LIBADS_SERVER LIBADS_PRINTER
+                 param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 libgpo ads LIBADS_SERVER LIBADS_PRINTER
                  LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
                  LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
                  REGFIO NDR_NTPRINTING RPC_NDR_WINREG