X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=source3%2Fwscript_build;h=b1ca2cf26861e3d9116589c24d94dd08d134c8e9;hp=57660ae4e7f7c6b9f1bc06d718e5550b412b6fff;hb=6a56d2fda0e68cd1480fdf9e3f6019e70fe1bcd4;hpb=43bd918446323f940f82b8b627730433657f367b diff --git a/source3/wscript_build b/source3/wscript_build index 57660ae4e7f..b1ca2cf2686 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -3,240 +3,6 @@ from samba_utils import * import samba_version, samba3 -TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c''' - -LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c - libsmb/clispnego.c - libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c - libsmb/clireadwrite.c libsmb/clilist.c libsmb/cliprint.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/async_smb.c - libsmb/smb2cli_tcon.c - libsmb/cli_np_tstream.c - libsmb/reparse_symlink.c - libsmb/clisymlink.c - libsmb/smbsock_connect.c - libsmb/cli_smb2_fnum.c''' - -LIBMSRPC_SRC = ''' - rpc_client/cli_pipe.c - rpc_client/rpc_transport_np.c - rpc_client/rpc_transport_sock.c - rpc_client/rpc_transport_tstream.c - librpc/rpc/dcerpc_helpers.c - ''' - -# -# registry-related objects -# - -REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c''' -REG_INIT_FULL_SRC = '''registry/reg_init_full.c''' - -REG_API_REGF_SRC = '''registry/reg_api_regf.c''' - -REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c''' - -REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c - registry/reg_backend_shares.c - registry/reg_backend_netlogon_params.c - registry/reg_backend_prod_options.c - registry/reg_backend_tcpip_params.c - registry/reg_backend_hkpt_params.c - registry/reg_backend_current_version.c - registry/reg_backend_perflib.c''' - -REG_BASE_SRC = '''registry/reg_api.c - registry/reg_dispatcher.c - registry/reg_cachehook.c - registry/reg_objects.c - registry/reg_util_internal.c - lib/util_nttoken.c - registry/reg_backend_db.c - registry/reg_parse_internal.c - lib/cbuf.c - lib/srprs.c - registry/reg_init_basic.c''' - -REG_SMBCONF_SRC = ''' - ${REG_BACKENDS_SMBCONF_SRC} - ${REG_INIT_SMBCONF_SRC} - registry/reg_util_token.c - registry/reg_api_util.c''' - -REG_FULL_SRC = ''' - ${REG_BACKENDS_EXTRA_SRC} - ${REG_INIT_FULL_SRC} - registry/reg_perfcount.c''' - -SERVICES_SRC = '''services/svc_spoolss.c - services/svc_rcinit.c - services/svc_winreg_glue.c - services/svc_netlogon.c - services/svc_winreg.c - services/svc_wins.c''' - -LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c''' - -RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c''' - -LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c locking/share_mode_lock.c''' - -PRIVILEGES_SRC = '''lib/privileges.c''' - -PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c''' - -PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c - lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c - lib/util_sid_passdb.c - lib/util_unixsids.c passdb/lookup_sid.c - passdb/login_cache.c - passdb/account_pol.c ${PRIVILEGES_SRC} - lib/util_nscd.c lib/winbind_util.c - passdb/pdb_util.c passdb/pdb_interface.c - passdb/pdb_secrets.c - passdb/pdb_unixid.c''' -#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC - -GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c''' - -PROFILE_SRC = '''profile/profile.c''' -PROFILES_SRC = '''utils/profiles.c''' - -OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c''' - -NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c''' - -FNAME_UTIL_SRC = '''lib/filename_util.c''' - - -PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c''' - -SLCACHE_SRC = '''libsmb/samlogon_cache.c''' - -DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c''' - -MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c''' - -SMBD_SRC_MAIN = '''smbd/server.c''' - -BUILDOPT_SRC = '''smbd/build_options.c''' - -SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c - smbd/utmp.c smbd/session.c - smbd/dfree.c smbd/dir.c smbd/password.c smbd/conn_msg.c - smbd/conn_idle.c - smbd/share_access.c smbd/fileio.c - smbd/ipc.c smbd/lanman.c smbd/negprot.c - smbd/message.c smbd/nttrans.c smbd/pipes.c - smbd/reply.c smbd/sesssetup.c smbd/trans2.c smbd/uid.c - smbd/dosmode.c smbd/filename.c smbd/open.c smbd/close.c - smbd/blocking.c smbd/sec_ctx.c smbd/srvstr.c - smbd/vfs.c smbd/perfcount.c smbd/statcache.c smbd/seal.c - smbd/posix_acls.c lib/sysacls.c - smbd/process.c smbd/service.c smbd/error.c - printing/printspoolss.c printing/spoolssd.c - lib/sysquotas.c lib/sysquotas_linux.c - lib/sysquotas_xfs.c lib/sysquotas_4A.c lib/sysquotas_4B.c - lib/sysquotas_nfs.c - lib/background.c - lib/sessionid_tdb.c - lib/conn_tdb.c - smbd/fake_file.c - smbd/quotas.c smbd/ntquotas.c smbd/msdfs.c - smbd/aio.c smbd/statvfs.c - smbd/dmapi.c smbd/signing.c - smbd/file_access.c - smbd/dnsregister.c smbd/globals.c - smbd/smb2_server.c - smbd/smb2_glue.c - smbd/smb2_negprot.c - smbd/smb2_sesssetup.c - smbd/smb2_tcon.c - smbd/smb2_create.c - smbd/smb2_close.c - smbd/smb2_flush.c - smbd/smb2_read.c - smbd/smb2_write.c - smbd/smb2_lock.c - smbd/smb2_ioctl.c - smbd/smb2_ioctl_dfs.c - smbd/smb2_ioctl_filesys.c - smbd/smb2_ioctl_named_pipe.c - smbd/smb2_ioctl_network_fs.c - smbd/smb2_keepalive.c - smbd/smb2_find.c - smbd/smb2_notify.c - smbd/smb2_getinfo.c - smbd/smb2_setinfo.c - smbd/smb2_break.c - smbd/smbXsrv_version.c - smbd/smbXsrv_session.c - smbd/smbXsrv_tcon.c - smbd/smbXsrv_open.c - smbd/server_exit.c - smbd/durable.c - smbd/scavenger.c - ${MANGLE_SRC}''' - -SMBD_SRC_BASE = '''${SMBD_SRC_SRV} - ${OPLOCK_SRC} ${NOTIFY_SRC} - ${BUILDOPT_SRC}''' - -PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c - printing/print_cups.c printing/print_generic.c - printing/lpq_parse.c printing/load.c printing/print_standard.c - printing/print_iprint.c printing/printer_list.c''' - -PRINTBASE_SRC = '''printing/notify.c printing/printing_db.c''' -PRINTBACKEND_SRC = '''printing/printing.c - printing/nt_printing.c - printing/nt_printing_tdb.c - printing/nt_printing_migrate_internal.c - printing/nt_printing_ads.c - printing/queue_process.c''' - -STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c''' - -SMBCONTROL_SRC = '''utils/smbcontrol.c''' - -SMBTREE_SRC = '''utils/smbtree.c''' - -TESTPARM_SRC = 'utils/testparm.c' - -SMBTA_UTIL_SRC = '''utils/smbta-util.c''' - -TEST_LP_LOAD_SRC = '''param/test_lp_load.c''' - -PASSWD_UTIL_SRC = 'utils/passwd_util.c' - -SMBPASSWD_SRC = '''utils/smbpasswd.c''' - -PDBEDIT_SRC = '''utils/pdbedit.c''' - -SMBGET_SRC = '''utils/smbget.c''' - -RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c - rpcclient/cmd_samr.c rpcclient/cmd_spoolss.c - rpcclient/cmd_netlogon.c rpcclient/cmd_srvsvc.c - rpcclient/cmd_dfs.c rpcclient/cmd_epmapper.c - rpcclient/cmd_dssetup.c rpcclient/cmd_echo.c - rpcclient/cmd_shutdown.c rpcclient/cmd_test.c - rpcclient/cmd_wkssvc.c rpcclient/cmd_ntsvcs.c - rpcclient/cmd_drsuapi.c rpcclient/cmd_eventlog.c - rpcclient/cmd_winreg.c rpcclient/cmd_fss.c''' - -RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}''' - -LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c - libsmb/libsmb_thread_posix.c''' - -LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c' - -LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}' - LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c' SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c' @@ -412,13 +178,12 @@ bld.SAMBA3_LIBRARY('netapi', vnum='0') bld.SAMBA3_LIBRARY('smbsharemodes', - source=LIBSMBSHAREMODES_SRC, + source='libsmb/smb_share_modes.c', public_deps='''talloc tdb_compat''', deps='''ccan-hash''', public_headers='include/smb_share_modes.h', pc_files='libsmb/smbsharemodes.pc', - vnum='0', - vars=locals()) + vnum='0') bld.SAMBA3_LIBRARY('nss_wins', source=WINBIND_WINS_NSS_SRC, @@ -433,13 +198,16 @@ bld.SAMBA3_LIBRARY('gse', private_library=True) bld.SAMBA3_LIBRARY('msrpc3', - source='${LIBMSRPC_SRC}', + source='''rpc_client/cli_pipe.c + rpc_client/rpc_transport_np.c + rpc_client/rpc_transport_sock.c + rpc_client/rpc_transport_tstream.c + librpc/rpc/dcerpc_helpers.c''', deps='''ndr ndr-standard RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH LIBTSOCKET gse dcerpc-binding libsmb ndr-table''', - vars=locals(), private_library=True) bld.SAMBA3_LIBRARY('gpo', @@ -459,11 +227,13 @@ bld.SAMBA3_SUBSYSTEM('AVAHI', enabled=bld.env.with_avahi) bld.SAMBA3_SUBSYSTEM('GROUPDB', - source=GROUPDB_SRC, + source='groupdb/mapping.c groupdb/mapping_tdb.c', deps='tdb_compat') bld.SAMBA3_SUBSYSTEM('TLDAP', - source=TLDAP_SRC, + source='''lib/tldap.c + lib/tldap_util.c + lib/util_tsock.c''', deps='asn1util LIBTSOCKET') # libpdb.so should not expose internal symbols that are only usable @@ -497,19 +267,34 @@ private_pdb_match = private_pdb_match + ldapsam_pdb_match private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match) bld.SAMBA3_LIBRARY('pdb', - source=PASSDB_SRC, + source='''passdb/pdb_get_set.c + passdb/passdb.c + lib/util_wellknown.c + lib/util_builtin.c + passdb/pdb_compat.c + lib/util_sid_passdb.c + lib/util_unixsids.c + passdb/lookup_sid.c + passdb/login_cache.c + passdb/account_pol.c + lib/privileges.c + lib/util_nscd.c + lib/winbind_util.c + passdb/pdb_util.c + passdb/pdb_interface.c + passdb/pdb_secrets.c + passdb/pdb_unixid.c''', deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping', private_library=False, pc_files=[], public_headers_install=True, public_headers=''' - include/passdb.h - passdb/machine_sid.h - passdb/lookup_sid.h''', + include/passdb.h + passdb/machine_sid.h + passdb/lookup_sid.h''', abi_match=private_pdb_match, abi_directory='passdb/ABI', - vnum='0', - vars=locals()) + vnum='0') bld.SAMBA3_LIBRARY('smbldaphelper', source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c', @@ -563,12 +348,21 @@ bld.SAMBA3_SUBSYSTEM('REGFIO', deps='samba-util REG_PARSE_PRS') bld.SAMBA3_SUBSYSTEM('REG_API_REGF', - source=REG_API_REGF_SRC, - deps='samba-util', - vars=locals()) + source='registry/reg_api_regf.c', + deps='samba-util') bld.SAMBA3_LIBRARY('smbregistry', - source=REG_BASE_SRC, + source='''registry/reg_api.c + registry/reg_dispatcher.c + registry/reg_cachehook.c + registry/reg_objects.c + registry/reg_util_internal.c + lib/util_nttoken.c + registry/reg_backend_db.c + registry/reg_parse_internal.c + lib/cbuf.c + lib/srprs.c + registry/reg_init_basic.c''', deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc replace util_reg samba-util samba-security errors3 dbwrap samba3-util''', @@ -576,14 +370,24 @@ bld.SAMBA3_LIBRARY('smbregistry', private_library=True) bld.SAMBA3_SUBSYSTEM('REG_SMBCONF', - source=REG_SMBCONF_SRC, - deps='smbregistry', - vars=locals()) + source='''registry/reg_backend_smbconf.c + registry/reg_init_smbconf.c + registry/reg_util_token.c + registry/reg_api_util.c''', + deps='smbregistry') bld.SAMBA3_SUBSYSTEM('REG_FULL', - source=REG_FULL_SRC, - deps='REG_SMBCONF tdb-wrap3', - vars=locals()) + source='''registry/reg_backend_printing.c + registry/reg_backend_shares.c + registry/reg_backend_netlogon_params.c + registry/reg_backend_prod_options.c + registry/reg_backend_tcpip_params.c + registry/reg_backend_hkpt_params.c + registry/reg_backend_current_version.c + registry/reg_backend_perflib.c + registry/reg_init_full.c + registry/reg_perfcount.c''', + deps='REG_SMBCONF tdb-wrap3') bld.SAMBA3_LIBRARY('popt_samba3', source='lib/popt_common.c', @@ -688,7 +492,32 @@ bld.SAMBA3_SUBSYSTEM('auth_generic', vars=locals()) bld.SAMBA3_LIBRARY('libsmb', - source=LIBSMB_SRC, + source='''libsmb/clientgen.c + libsmb/cliconnect.c + libsmb/clifile.c + libsmb/clispnego.c + libsmb/clirap.c + libsmb/clierror.c + libsmb/climessage.c + libsmb/clireadwrite.c + libsmb/clilist.c + libsmb/cliprint.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/async_smb.c + libsmb/smb2cli_tcon.c + libsmb/cli_np_tstream.c + libsmb/reparse_symlink.c + libsmb/clisymlink.c + libsmb/smbsock_connect.c + libsmb/cli_smb2_fnum.c''', deps=''' LIBNTLMSSP auth_generic @@ -700,7 +529,6 @@ bld.SAMBA3_LIBRARY('libsmb', cli_smb_common util_cmdline tevent''', - vars=locals(), private_library=True) bld.SAMBA3_SUBSYSTEM('CLDAP', @@ -789,60 +617,160 @@ bld.SAMBA3_LIBRARY('smbd_conn', private_library=True) bld.SAMBA3_LIBRARY('smbd_base', - source=SMBD_SRC_BASE, - deps=''' - talloc - tevent - pdb - libsmb - msrpc3 - vfs - vfs_default - vfs_posixacl - popt_samba3 - samba3core - smbd_conn - param_service - AVAHI - PRINTBASE - PROFILE - LOCKING - LIBADS_SERVER - LIBAFS - RPC_SERVER - NDR_SMBXSRV - LIBASYS - ccan-hash - NDR_SMB_ACL - netapi - NDR_IOCTL - ''' + bld.env['dmapi_lib'], - private_library=True, - vars=locals()) + source=''' + smbd/server_reload.c + smbd/files.c + smbd/connection.c + smbd/utmp.c + smbd/session.c + smbd/dfree.c + smbd/dir.c + smbd/password.c + smbd/conn_msg.c + smbd/conn_idle.c + smbd/share_access.c + smbd/fileio.c + smbd/ipc.c + smbd/lanman.c + smbd/negprot.c + smbd/message.c + smbd/nttrans.c + smbd/pipes.c + smbd/reply.c + smbd/sesssetup.c + smbd/trans2.c + smbd/uid.c + smbd/dosmode.c + smbd/filename.c + smbd/open.c + smbd/close.c + smbd/blocking.c + smbd/sec_ctx.c + smbd/srvstr.c + smbd/vfs.c + smbd/perfcount.c + smbd/statcache.c + smbd/seal.c + smbd/posix_acls.c + lib/sysacls.c + smbd/process.c + smbd/service.c + smbd/error.c + printing/printspoolss.c + printing/spoolssd.c + lib/sysquotas.c + lib/sysquotas_linux.c + lib/sysquotas_xfs.c + lib/sysquotas_4A.c + lib/sysquotas_4B.c + lib/sysquotas_nfs.c + lib/background.c + lib/sessionid_tdb.c + lib/conn_tdb.c + smbd/fake_file.c + smbd/quotas.c + smbd/ntquotas.c + smbd/msdfs.c + smbd/aio.c smbd/statvfs.c + smbd/dmapi.c + smbd/signing.c + smbd/file_access.c + smbd/dnsregister.c smbd/globals.c + smbd/smb2_server.c + smbd/smb2_glue.c + smbd/smb2_negprot.c + smbd/smb2_sesssetup.c + smbd/smb2_tcon.c + smbd/smb2_create.c + smbd/smb2_close.c + smbd/smb2_flush.c + smbd/smb2_read.c + smbd/smb2_write.c + smbd/smb2_lock.c + smbd/smb2_ioctl.c + smbd/smb2_ioctl_dfs.c + smbd/smb2_ioctl_filesys.c + smbd/smb2_ioctl_named_pipe.c + smbd/smb2_ioctl_network_fs.c + smbd/smb2_keepalive.c + smbd/smb2_find.c + smbd/smb2_notify.c + smbd/smb2_getinfo.c + smbd/smb2_setinfo.c + smbd/smb2_break.c + smbd/smbXsrv_version.c + smbd/smbXsrv_session.c + smbd/smbXsrv_tcon.c + smbd/smbXsrv_open.c + smbd/server_exit.c + smbd/durable.c + smbd/scavenger.c + smbd/mangle.c + smbd/mangle_hash.c + smbd/mangle_hash2.c + smbd/oplock.c + smbd/oplock_irix.c + smbd/oplock_linux.c + smbd/notify.c + smbd/notify_inotify.c + smbd/notify_internal.c + smbd/build_options.c''', + deps=''' + talloc + tevent + pdb + libsmb + msrpc3 + vfs + vfs_default + vfs_posixacl + popt_samba3 + samba3core + smbd_conn + param_service + AVAHI + PRINTBASE + PROFILE + LOCKING + LIBADS_SERVER + LIBAFS + RPC_SERVER + NDR_SMBXSRV + LIBASYS + ccan-hash + NDR_SMB_ACL + netapi + NDR_IOCTL + ''' + bld.env['dmapi_lib'], + private_library=True) bld.SAMBA3_SUBSYSTEM('LOCKING', - source='${LOCKING_SRC}', + source='''locking/locking.c + locking/brlock.c + locking/posix.c + locking/share_mode_lock.c''', deps=''' tdb_compat talloc NDR_OPEN_FILES - FNAME_UTIL''', - vars=locals()) + FNAME_UTIL''') bld.SAMBA3_SUBSYSTEM('PROFILE', - source='${PROFILE_SRC}', - deps='samba-util', - vars=locals()) + source='profile/profile.c', + deps='samba-util') bld.SAMBA3_SUBSYSTEM('PRINTBASE', - source=PRINTBASE_SRC, - deps='samba-util tdb_compat', - vars=locals()) + source='''printing/notify.c printing/printing_db.c''', + deps='samba-util tdb_compat') bld.SAMBA3_SUBSYSTEM('PRINTBACKEND', - source=PRINTBACKEND_SRC, - deps='PRINTBASE LIBADS_PRINTER tdb_compat printing_migrate', - vars=locals()) + source='''printing/printing.c + printing/nt_printing.c + printing/nt_printing_tdb.c + printing/nt_printing_migrate_internal.c + printing/nt_printing_ads.c + printing/queue_process.c''', + deps='PRINTBASE LIBADS_PRINTER tdb_compat printing_migrate') bld.SAMBA3_LIBRARY('printing_migrate', source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c', @@ -851,19 +779,25 @@ bld.SAMBA3_LIBRARY('printing_migrate', private_library=True) bld.SAMBA3_SUBSYSTEM('PRINTING', - source=PRINTING_SRC, - deps='NDR_PRINTCAP tdb_compat cups', - vars=locals()) + source='''printing/pcap.c + printing/print_svid.c + printing/print_aix.c + printing/print_cups.c + printing/print_generic.c + printing/lpq_parse.c + printing/load.c + printing/print_standard.c + printing/print_iprint.c + printing/printer_list.c''', + deps='NDR_PRINTCAP tdb_compat cups') bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL', - source=PASSWD_UTIL_SRC, - deps='samba-util', - vars=locals()) + source='utils/passwd_util.c', + deps='samba-util') bld.SAMBA3_SUBSYSTEM('FNAME_UTIL', - source=FNAME_UTIL_SRC, - deps='samba-util', - vars=locals()) + source='lib/filename_util.c', + deps='samba-util') bld.SAMBA3_SUBSYSTEM('LIBNET', source=LIBNET_SRC, @@ -888,9 +822,8 @@ bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG', - source=LIB_EVENTLOG_SRC, - deps='NDR_EVENTLOG tdb_compat', - vars=locals()) + source='lib/eventlog/eventlog.c', + deps='NDR_EVENTLOG tdb_compat') bld.SAMBA3_SUBSYSTEM('LIBNMB', source='''libsmb/unexpected.c @@ -902,14 +835,17 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB', deps='addns lmhosts resolv') bld.SAMBA3_SUBSYSTEM('SERVICES', - source=SERVICES_SRC, - deps='samba-util', - vars=locals()) + source='''services/svc_spoolss.c + services/svc_rcinit.c + services/svc_winreg_glue.c + services/svc_netlogon.c + services/svc_winreg.c + services/svc_wins.c''', + deps='samba-util') bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH', - source=PLAINTEXT_AUTH_SRC, - deps='pam PAM_ERRORS', - vars=locals()) + source='''auth/pampass.c auth/pass_check.c''', + deps='pam PAM_ERRORS') bld.SAMBA3_SUBSYSTEM('PASSCHANGE', source='libsmb/passchange.c', @@ -923,14 +859,14 @@ bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION', deps='samba-util') bld.SAMBA3_SUBSYSTEM('SLCACHE', - source=SLCACHE_SRC, - deps='samba-util tdb_compat', - vars=locals()) + source='libsmb/samlogon_cache.c', + deps='samba-util tdb_compat') bld.SAMBA3_SUBSYSTEM('DCUTIL', - source=DCUTIL_SRC, - deps='ads msrpc3 libcli_lsa3', - vars=locals()) + source='''libsmb/namequery_dc.c + libsmb/trustdom_cache.c + libsmb/dsgetdcname.c''', + deps='ads msrpc3 libcli_lsa3') bld.SAMBA3_LIBRARY('trusts_util', source='libsmb/trusts_util.c', @@ -992,9 +928,8 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG_INTERNAL', deps='LIBCLI_WINREG RPC_NCACN_NP') bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL', - source=RPC_CLIENT_SCHANNEL_SRC, - deps='samba-util krb5samba', - vars=locals()) + source='rpc_client/cli_pipe_schannel.c', + deps='samba-util krb5samba') bld.SAMBA3_SUBSYSTEM('INIT_LSA', source='rpc_client/init_lsa.c', @@ -1011,10 +946,9 @@ bld.SAMBA3_SUBSYSTEM('INIT_SAMR', ########################## BINARIES ################################# bld.SAMBA3_BINARY('smbd/smbd', - source='${SMBD_SRC_MAIN}', + source='smbd/server.c', deps='smbd_base EPMD LSASD', - install_path='${SBINDIR}', - vars=locals()) + install_path='${SBINDIR}') bld.SAMBA3_BINARY('nmbd/nmbd', source='''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c @@ -1157,7 +1091,24 @@ bld.SAMBA3_BINARY('winbindd/winbindd', install_path='${SBINDIR}') bld.SAMBA3_BINARY('rpcclient/rpcclient', - source=RPCCLIENT_SRC, + source='''rpcclient/rpcclient.c + rpcclient/cmd_lsarpc.c + rpcclient/cmd_samr.c + rpcclient/cmd_spoolss.c + rpcclient/cmd_netlogon.c + rpcclient/cmd_srvsvc.c + rpcclient/cmd_dfs.c + rpcclient/cmd_epmapper.c + rpcclient/cmd_dssetup.c + rpcclient/cmd_echo.c + rpcclient/cmd_shutdown.c + rpcclient/cmd_test.c + rpcclient/cmd_wkssvc.c + rpcclient/cmd_ntsvcs.c + rpcclient/cmd_drsuapi.c + rpcclient/cmd_eventlog.c + rpcclient/cmd_winreg.c + rpcclient/cmd_fss.c''', deps=''' talloc popt_samba3 @@ -1184,9 +1135,8 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient', RPC_NDR_NTSVCS RPC_NDR_EVENTLOG INIT_SAMR - RPC_NDR_FSRVP - ''', - vars=locals()) + RPC_NDR_FSRVP + ''') bld.SAMBA3_BINARY('client/smbclient', source='''client/client.c @@ -1245,13 +1195,12 @@ bld.SAMBA3_BINARY('net', vars=locals()) bld.SAMBA3_BINARY('profiles', - source=PROFILES_SRC, + source='utils/profiles.c', deps=''' talloc popt_samba3 param - REGFIO''', - vars=locals()) + REGFIO''') bld.SAMBA3_BINARY('smbspool', source=CUPS_SRC, @@ -1264,43 +1213,41 @@ bld.SAMBA3_BINARY('smbspool', vars=locals()) bld.SAMBA3_BINARY('testparm', - source=TESTPARM_SRC, + source='utils/testparm.c', deps=''' talloc param - popt_samba3''', - vars=locals()) + popt_samba3''') bld.SAMBA3_BINARY('smbta-util', - source=SMBTA_UTIL_SRC, + source='utils/smbta-util.c', deps=''' talloc secrets3 - param''', - vars=locals()) + param''') bld.SAMBA3_BINARY('smbstatus', - source=STATUS_SRC, + source='''utils/status.c + utils/status_profile.c + smbd/notify_internal.c''', deps=''' talloc param popt_samba3 smbd_base LOCKING - PROFILE''', - vars=locals()) + PROFILE''') bld.SAMBA3_BINARY('smbcontrol', - source=SMBCONTROL_SRC, + source='utils/smbcontrol.c', deps=''' talloc param popt_samba3 - PRINTBASE''', - vars=locals()) + PRINTBASE''') bld.SAMBA3_BINARY('smbtree', - source=SMBTREE_SRC, + source='utils/smbtree.c', deps=''' talloc param @@ -1308,36 +1255,32 @@ bld.SAMBA3_BINARY('smbtree', msrpc3 popt_samba3 PROFILE - RPC_NDR_SRVSVC''', - vars=locals()) + RPC_NDR_SRVSVC''') bld.SAMBA3_BINARY('smbpasswd', - source=SMBPASSWD_SRC, + source='utils/smbpasswd.c', deps=''' talloc param pdb PASSWD_UTIL - PASSCHANGE''', - vars=locals()) + PASSCHANGE''') bld.SAMBA3_BINARY('pdbedit', - source=PDBEDIT_SRC, + source='utils/pdbedit.c', deps=''' talloc param popt_samba3 pdb - PASSWD_UTIL''', - vars=locals()) + PASSWD_UTIL''') bld.SAMBA3_BINARY('smbget', - source=SMBGET_SRC, + source='utils/smbget.c', deps=''' talloc popt_samba3 - smbclient''', - vars=locals()) + smbclient''') bld.SAMBA3_BINARY('nmblookup', source=NMBLOOKUP_SRC, @@ -1506,13 +1449,12 @@ bld.SAMBA3_BINARY('rpc_open_tcp', vars=locals()) bld.SAMBA3_BINARY('test_lp_load', - source=TEST_LP_LOAD_SRC, + source='param/test_lp_load.c', deps=''' talloc param popt_samba3''', - install=False, - vars=locals()) + install=False) bld.SAMBA3_BINARY('dbwrap_tool', source=DBWRAP_TOOL_SRC,