librpc/rpc: add dcerpc_binding_handle_auth_info()

[mat/samba.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index 14373a9c3c6cfb33f47ec17994a75894b052eb00..dd2e054e53d2871a70eb552c6f332c4cbe49e20f 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
 from samba_utils import *
 import samba_version, samba3
 
-SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
-
 LIBS='ICONV'
 
 config_h = "../include/config.h"
@@ -29,6 +27,7 @@ bld.SAMBA3_LIBRARY('netapi',
                     lib/netapi/libnetapi.c
                     lib/netapi/joindomain.c
                     lib/netapi/serverinfo.c
+                    lib/netapi/wkstainfo.c
                     lib/netapi/getdc.c
                     lib/netapi/user.c
                     lib/netapi/group.c
@@ -186,36 +185,12 @@ bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
                      source='lib/server_mutex.c',
                      deps='talloc')
 
-bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
-                     source='param/util.c',
-                     deps='talloc')
-
-bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
-                     source='param/loadparm_ctx.c',
-                     deps='''talloc s3_param_h param''',
-                     vars=locals())
-
-bld.SAMBA_GENERATOR('param/param_global_h',
-                    source= '../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c',
-                    target='param/param_global.h',
-                    rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
-
 bld.SAMBA3_SUBSYSTEM('param',
                    source='''param/loadparm.c
                    lib/sharesec.c
                    lib/ldap_debug_handler.c
                    lib/util_names.c''',
-                   deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h param/param_global_h cups''')
-
-bld.SAMBA3_PYTHON('pys3param',
-                  source='param/pyparam.c',
-                  deps='param',
-                  public_deps='samba-hostconfig pytalloc-util talloc',
-                  realname='samba/samba3/param.so')
-    
-bld.SAMBA3_SUBSYSTEM('param_service',
-                     source='param/service.c',
-                     deps = 'USER_UTIL param PRINTING')
+                   deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h s3_param_global_h cups''')
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
@@ -367,8 +342,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
 
 bld.SAMBA3_SUBSYSTEM('auth_generic',
                     source='libsmb/auth_generic.c',
-                    deps='LIBNTLMSSP gse gensec',
-                    vars=locals())
+                    deps='LIBNTLMSSP gse gensec')
 
 bld.SAMBA3_LIBRARY('libsmb',
                    source='''libsmb/clientgen.c
@@ -412,8 +386,7 @@ bld.SAMBA3_LIBRARY('libsmb',
 
 bld.SAMBA3_SUBSYSTEM('CLDAP',
                     source='libads/cldap.c',
-                    deps='cli-ldap-common cli_cldap LIBTSOCKET',
-                    vars=locals())
+                    deps='cli-ldap-common cli_cldap LIBTSOCKET')
 
 # NOTE: The secrets3 library is a low level library used by several subsystems.
 # PLEASE DO NOT make it depend on high level libraries like PDB, if you are
@@ -655,7 +628,6 @@ bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
 bld.SAMBA3_LIBRARY('printing_migrate',
                     source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c',
                     deps='NDR_NTPRINTING cli_spoolss RPC_NDR_WINREG LIBCLI_WINREG param',
-                    vars=locals(),
                     private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('PRINTING',
@@ -686,7 +658,6 @@ bld.SAMBA3_SUBSYSTEM('LIBNET',
 bld.SAMBA3_LIBRARY('net_keytab',
                    source='libnet/libnet_keytab.c',
                    deps='krb5samba ads',
-                   vars=locals(),
                    private_library=True)
 
 
@@ -754,13 +725,11 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL',
 bld.SAMBA3_LIBRARY('trusts_util',
                    source='libsmb/trusts_util.c',
                    deps='libcli_netlogon3 msrpc3 pdb',
-                   vars=locals(),
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     source='lib/util_tdb.c',
-                    deps='talloc samba3-util',
-                    vars=locals())
+                    deps='talloc samba3-util')
 
 bld.SAMBA3_LIBRARY('samba3-util',
                    source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/namearray.c lib/file_id.c''',
@@ -1065,6 +1034,7 @@ bld.SAMBA3_BINARY('net',
                  utils/net_dns.c
                  utils/net_ads_gpo.c
                  utils/net_conf.c
+                 utils/net_conf_util.c
                  utils/net_join.c
                  utils/net_user.c
                  utils/net_group.c
@@ -1120,7 +1090,8 @@ bld.SAMBA3_BINARY('net',
                  RPC_NDR_DSSETUP
                  RPC_NDR_INITSHUTDOWN
                  printing_migrate
-                 trusts_util''')
+                 trusts_util
+                 IDMAP_AUTORID_TDB''')
 
 bld.SAMBA3_BINARY('profiles',
                  source='utils/profiles.c',
@@ -1364,8 +1335,7 @@ bld.SAMBA3_BINARY('versiontest',
                  deps='''
                  SAMBA_VERSION
                  param''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('ntlm_auth',
                  source='''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c''',
@@ -1379,8 +1349,7 @@ bld.SAMBA3_BINARY('ntlm_auth',
 
 bld.SAMBA3_BINARY('timelimit',
                  source='script/tests/timelimit.c',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('rpc_open_tcp',
                  source='torture/rpc_open_tcp.c',
@@ -1389,14 +1358,6 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
                  msrpc3''',
                  install=False)
 
-bld.SAMBA3_BINARY('test_lp_load',
-                 source='param/test_lp_load.c',
-                 deps='''
-                 talloc
-                 param
-                 popt_samba3''',
-                 install=False)
-
 bld.SAMBA3_BINARY('dbwrap_tool',
                  source='utils/dbwrap_tool.c',
                  deps='''
@@ -1411,12 +1372,11 @@ bld.SAMBA3_BINARY('dbwrap_torture',
                  install=False)
 
 bld.SAMBA3_BINARY('split_tokens',
-                 source=SPLIT_TOKENS_SRC,
+                 source='utils/split_tokens.c',
                  deps='''
                  talloc
                  popt_samba3''',
-                 install=False,
-                 vars=locals())
+                 install=False)
 
 bld.SAMBA3_BINARY('vlp',
                  source='printing/tests/vlp.c',
@@ -1443,8 +1403,7 @@ bld.SAMBA3_BINARY('samba-regedit',
                             utils/regedit_valuelist.c utils/regedit_dialog.c
                             utils/regedit_hexedit.c""",
                   deps='ncurses menu panel form registry param popt_samba3 smbregistry',
-                  enabled=bld.env.build_regedit,
-                  vars=locals())
+                  enabled=bld.env.build_regedit)
 
 ########################## INCLUDES #################################
 
@@ -1457,6 +1416,7 @@ bld.RECURSE('librpc/idl')
 bld.RECURSE('libsmb')
 bld.RECURSE('modules')
 bld.RECURSE('pam_smbpass')
+bld.RECURSE('param')
 bld.RECURSE('passdb')
 bld.RECURSE('rpc_server')
 bld.RECURSE('script')