lib/compression: add shared wscript_build.

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

diff --git a/source3/wscript_build b/source3/wscript_build
index 600006970f92dbe292a0734faed32855fd5ec8ae..fde1d175a654faf042fee4ef745a7eaa625f8467 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -43,7 +43,10 @@ LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c'''
 
 LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
 
-LIBRPCCLI_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
@@ -80,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
@@ -97,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}
@@ -238,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}
@@ -247,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'''
@@ -563,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
@@ -604,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'''
 
@@ -821,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',
@@ -995,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',
@@ -1052,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',
@@ -1073,21 +1069,13 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
        deps='talloc',
        autoproto='nbtname.h')
 
-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('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('LIBRPCCLI_NETLOGON',
                     source=LIBRPCCLI_NETLOGON_SRC,
@@ -1097,6 +1085,10 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
                     source=LIBCLI_SPOOLSS_SRC,
                     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,
        vars=locals())
@@ -1137,6 +1129,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
                  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}',
@@ -1291,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',