bld.SAMBA_BLDOPTIONS('smbd/build_options.c')
-t = bld.SAMBA_GENERATOR('build_env.h',
- source='script/build_env.sh',
- target='include/build_env.h',
- rule='${SRC} ${SRCDIR} ${BUILDDIR} ${CC} > ${TGT}')
-# todo: work out what is really wanted here
-t.env.SRCDIR = bld.path.abspath()
-t.env.BUILDDIR = bld.path.abspath()
-
bld.SETUP_BUILD_GROUPS()
######################## SUBSYSTEMS #################################
bld.SAMBA3_LIBRARY('gse',
source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
- deps='krb5samba gensec param KRBCLIENT secrets3',
+ deps='krb5samba gensec smbconf KRBCLIENT secrets3',
private_library=True)
bld.SAMBA3_LIBRARY('msrpc3',
''',
private_library=True)
-bld.SAMBA3_LIBRARY('gpo',
- source='''
- ../libgpo/gpo_ldap.c
- ../libgpo/gpo_ini.c
- ../libgpo/gpo_util.c
- ../libgpo/gpo_fetch.c
- libgpo/gpo_filesync.c
- ../libgpo/gpo_sec.c
- libgpo/gpo_reg.c
- ''',
- deps='''
- talloc
- ads
- TOKEN_UTIL
- gpext
- auth
- ''',
- private_library=True)
-
bld.SAMBA3_SUBSYSTEM('AVAHI',
source='''
lib/avahi.c
''',
abi_match=private_pdb_match,
abi_directory='passdb/ABI',
- vnum='0.25.0')
+ vnum='0.27.0')
bld.SAMBA3_SUBSYSTEM('pdb',
source='''
source='lib/server_mutex.c',
deps='talloc')
-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_global.h
- cups
- ''')
-
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
bld.SAMBA3_SUBSYSTEM('REG_PARSE_PRS',
source='registry/reg_api_regf.c',
deps='samba-util')
-bld.SAMBA3_LIBRARY('smbregistry',
+# Do not link against this use 'smbconf'
+bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
source='''
registry/reg_api.c
registry/reg_dispatcher.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
''',
errors3
dbwrap
samba3-util
- ''',
- allow_undefined_symbols=True,
- private_library=True)
+ ''')
+# Do not link against this use 'smbconf'
bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
source='''
registry/reg_backend_smbconf.c
registry/reg_util_token.c
registry/reg_api_util.c
''',
- deps='smbregistry')
+ deps='SMBREGISTRY')
bld.SAMBA3_SUBSYSTEM('REG_FULL',
source='''
registry/reg_init_full.c
registry/reg_perfcount.c''',
deps='''
- REG_SMBCONF
+ smbconf
tdb-wrap3
''')
lib/util_tsock.c
lib/util_transfer_file.c
lib/sys_popen.c
- lib/sock_exec.c
''',
deps='''
+ CHARSET3
ndr
LIBTSOCKET
samba-security
SAMBA_CLUSTER_SUPPORT_SOURCES='''
lib/cluster_support.c
lib/dbwrap/dbwrap_ctdb.c
- lib/messages_ctdbd.c
+ lib/messages_ctdb.c
+ lib/messages_ctdb_ref.c
lib/ctdbd_conn.c
'''
SAMBA_CLUSTER_SUPPORT_DEPS='''
lib/messages.c
lib/util_cluster.c
lib/id_cache.c
- lib/talloc_dict.c
lib/serverid.c
lib/server_id_watch.c
lib/server_id_db_util.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
lib/tevent_wait.c
lib/idmap_cache.c
+ lib/namemap_cache.c
lib/util_ea.c
lib/background.c
- lib/cleanupdb.c
''',
deps='''
samba3util
SAMBA_VERSION
PTHREADPOOL
interfaces
- param
+ smbconf
dbwrap
samba3-util
errors3
''',
deps='''
NDR_SECRETS
- param
+ smbconf
samba3util
dbwrap
''',
bld.SAMBA3_LIBRARY('smbldap',
source='lib/smbldap.c',
- deps='ldap lber samba-util param',
+ deps='ldap lber samba-util smbconf',
enabled=bld.CONFIG_SET("HAVE_LDAP"),
private_library=False,
abi_directory='lib/ABI',
abi_match='smbldap_*',
pc_files=[],
- vnum='0',
+ vnum='2',
public_headers='include/smbldap.h include/smb_ldap.h')
bld.SAMBA3_LIBRARY('ads',
ldap
lber
KRBCLIENT
- param
+ smbconf
LIBNMB
libsmb
DCUTIL
smbldap
+ trusts_util
''',
private_library=True)
source='libads/ldap_printer.c',
deps='samba-util krb5samba')
+# Only smbconf should link against this subsystem, else we will create
+# a circular dependency.
+bld.SAMBA3_SUBSYSTEM('SMBCONF_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
+ param_local.h
+ param_global.h
+ cups
+ ''')
+
bld.SAMBA3_LIBRARY('smbconf',
source='''
lib/smbconf/smbconf_init.c
lib/smbconf/smbconf_reg.c
''',
deps='''
- CHARSET3
LIBSMBCONF
REG_SMBCONF
SAMBA_VERSION
charset
cli_smb_common
errors3
- param
+ SMBCONF_PARAM
samba-util
- smbregistry
talloc
util_reg
''',
printing/printspoolss.c
lib/sessionid_tdb.c
lib/conn_tdb.c
+ lib/cleanupdb.c
smbd/fake_file.c
smbd/quotas.c
smbd/ntquotas.c
vfs_default
vfs_posixacl
inotify
- popt_samba3
samba3core
smbd_conn
param_service
RPC_SERVICE
NDR_SMBXSRV
LEASES_DB
+ LEASES_UTIL
sysquotas
NDR_SMB_ACL
netapi
NDR_IOCTL
notifyd
+ vfs_acl_common
''' +
bld.env['dmapi_lib'] +
bld.env['legacy_quota_libs'] +
tdb
talloc
LEASES_DB
+ LEASES_UTIL
NDR_OPEN_FILES
FNAME_UTIL
''')
source='locking/leases_db.c',
deps='NDR_LEASES_DB')
+bld.SAMBA3_SUBSYSTEM('LEASES_UTIL',
+ source='locking/leases_util.c',
+ deps='NDR_OPEN_FILES')
+
if bld.CONFIG_GET("WITH_PROFILE"):
bld.SAMBA3_SUBSYSTEM('PROFILE',
source='profile/profile.c',
cli_spoolss
RPC_NDR_WINREG
LIBCLI_WINREG
- param
+ smbconf
''',
private_library=True)
RPC_NDR_DRSUAPI
''')
-bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
- source='''
- libnet/libnet_samsync.c
- libnet/libnet_samsync_ldif.c
- libnet/libnet_samsync_passdb.c
- libnet/libnet_samsync_display.c
- libnet/libnet_samsync_keytab.c
- ''',
- deps='''
- LIBNET
- LIBCLI_SAMSYNC
- ''')
-
bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
source='lib/eventlog/eventlog.c',
deps='NDR_EVENTLOG tdb')
''')
bld.SAMBA3_SUBSYSTEM('DCUTIL',
- source='''libsmb/namequery_dc.c
- libsmb/trustdom_cache.c
- libsmb/dsgetdcname.c''',
- deps='ads msrpc3 libcli_lsa3')
+ 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',
- deps='libcli_netlogon3 msrpc3 samba-passdb',
+ deps='''
+ libcli_netlogon3
+ msrpc3
+ samba-passdb
+ ''',
private_library=True)
bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
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/namearray.c lib/file_id.c''',
- deps='samba-util charset',
+ source='''
+ lib/util_sec.c
+ lib/util_str.c
+ lib/adt_tree.c
+ lib/util_malloc.c
+ lib/namearray.c
+ lib/file_id.c
+ lib/cbuf.c
+ ''',
+ deps='''
+ samba-util
+ charset
+ ''',
private_library=True)
bld.SAMBA_LIBRARY('xattr_tdb',
private_library=True)
bld.SAMBA3_LIBRARY('CHARSET3',
- source='''lib/charcnv.c lib/fstring.c''',
- public_deps='ICONV_WRAPPER charset',
- deps='samba-util samba3-util',
+ source='''
+ lib/charcnv.c
+ lib/fstring.c
+ ''',
+ public_deps='''
+ ICONV_WRAPPER
+ charset
+ ''',
+ deps='''
+ samba-util
+ samba3-util
+ ''',
private_library=True)
bld.SAMBA3_SUBSYSTEM('errors3',
- source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
+ source='''
+ libsmb/errormap.c
+ libsmb/smberr.c
+ lib/errmap_unix.c
+ ''',
deps='samba-errors')
bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
private_library=True)
bld.SAMBA3_LIBRARY('libcli_netlogon3',
- source='rpc_client/cli_netlogon.c rpc_client/util_netlogon.c',
- deps='msrpc3 RPC_NDR_NETLOGON INIT_NETLOGON cliauth param NETLOGON_CREDS_CLI',
+ source='''
+ rpc_client/cli_netlogon.c
+ rpc_client/util_netlogon.c
+ ''',
+ deps='''
+ msrpc3
+ RPC_NDR_NETLOGON
+ INIT_NETLOGON
+ cliauth
+ smbconf
+ NETLOGON_CREDS_CLI''',
private_library=True)
bld.SAMBA3_LIBRARY('cli_spoolss',
- source='''rpc_client/cli_spoolss.c
- rpc_client/init_spoolss.c''',
- deps='RPC_NDR_SPOOLSS param secrets3',
+ source='''
+ rpc_client/cli_spoolss.c
+ rpc_client/init_spoolss.c
+ ''',
+ deps='''
+ RPC_NDR_SPOOLSS
+ smbconf
+ secrets3''',
private_library=True)
bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
bld.SAMBA3_BINARY('smbd/smbd',
source='smbd/server.c smbd/smbd_cleanupd.c',
deps='''
+ popt_samba3
smbd_base
EPMD
LSASD
bld.SAMBA3_BINARY('client/smbclient',
- source='''client/client.c
- client/clitar.c
- client/dnsbrowse.c''',
+ source='''
+ client/client.c
+ client/clitar.c
+ client/dnsbrowse.c
+ ''',
deps='''
- talloc
- popt_samba3
- param
- ndr-standard
- SMBREADLINE
- libsmb
- msrpc3
- RPC_NDR_SRVSVC
- cli_smb_common
- archive
- ''')
+ talloc
+ popt_samba3
+ smbconf
+ ndr-standard
+ SMBREADLINE
+ libsmb
+ msrpc3
+ RPC_NDR_SRVSVC
+ cli_smb_common
+ archive
+ ''')
bld.SAMBA3_BINARY('smbspool',
source='client/smbspool.c',
deps='''
- talloc
- popt_samba3
- param
- libsmb
- samba3core''')
+ talloc
+ popt_samba3
+ smbconf
+ libsmb
+ samba3core
+ ''')
bld.SAMBA3_BINARY('smbspool_krb5_wrapper',
source='client/smbspool_krb5_wrapper.c',
deps='''
- DYNCONFIG
- cups
- ''',
+ DYNCONFIG
+ cups
+ ''',
install_path='${LIBEXECDIR}/samba',
enabled=bld.CONFIG_SET('HAVE_CUPS'))
bld.SAMBA3_BINARY('locktest2',
source='torture/locktest2.c',
deps='''
- talloc
- param
- libsmb
- LOCKING''',
+ talloc
+ smbconf
+ libsmb
+ LOCKING
+ ''',
install=False)
smbstatus_source = 'utils/status.c smbd/notify_msg.c'
bld.SAMBA3_BINARY('smbstatus',
source=smbstatus_source,
deps='''
- talloc
- param
- popt_samba3
- smbd_base
- LOCKING
- PROFILE''')
+ talloc
+ smbconf
+ popt_samba3
+ smbd_base
+ LOCKING
+ PROFILE
+ ''')
bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
- source='''torture/torture.c
- torture/nbio.c
- torture/scanner.c
- torture/utable.c
- 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_nttrans_create.c
- torture/test_nttrans_fsctl.c
- torture/test_case_insensitive.c
- torture/test_notify_online.c
- torture/test_chain3.c
- torture/test_smb2.c
- torture/test_authinfo_structs.c
- torture/test_smbsock_any_connect.c
- torture/test_cleanup.c
- torture/test_notify.c
- lib/tevent_barrier.c
- torture/test_dbwrap_watch.c
- torture/test_idmap_tdb_common.c
- torture/test_dbwrap_ctdb.c
- torture/test_buffersize.c
- torture/test_messaging_read.c
- torture/test_messaging_fd_passing.c
- torture/test_oplock_cancel.c
- torture/test_pthreadpool_tevent.c
- torture/bench_pthreadpool.c
- torture/wbc_async.c''',
+ source='''
+ torture/torture.c
+ torture/nbio.c
+ torture/scanner.c
+ torture/utable.c
+ 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_nttrans_create.c
+ torture/test_nttrans_fsctl.c
+ torture/test_case_insensitive.c
+ torture/test_notify_online.c
+ torture/test_chain3.c
+ torture/test_smb2.c
+ torture/test_authinfo_structs.c
+ torture/test_smbsock_any_connect.c
+ torture/test_cleanup.c
+ torture/test_notify.c
+ lib/tevent_barrier.c
+ torture/test_dbwrap_watch.c
+ torture/test_dbwrap_do_locked.c
+ torture/test_idmap_tdb_common.c
+ torture/test_dbwrap_ctdb.c
+ torture/test_buffersize.c
+ torture/test_messaging_read.c
+ torture/test_messaging_fd_passing.c
+ torture/test_oplock_cancel.c
+ torture/test_pthreadpool_tevent.c
+ torture/bench_pthreadpool.c
+ torture/wbc_async.c
+ torture/test_g_lock.c
+ torture/test_namemap_cache.c
+ ''',
deps='''
- talloc
- param
- libsmb
- msrpc3
- TLDAP
- RPC_NDR_ECHO
- WB_REQTRANS
- LOCKING
- NDR_OPEN_FILES
- idmap
- IDMAP_TDB_COMMON
- samba-cluster-support
- ''',
+ talloc
+ smbconf
+ libsmb
+ msrpc3
+ TLDAP
+ RPC_NDR_ECHO
+ WB_REQTRANS
+ LOCKING
+ NDR_OPEN_FILES
+ idmap
+ IDMAP_TDB_COMMON
+ samba-cluster-support
+ ''',
cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
install=False)
bld.SAMBA3_BINARY('smbconftort',
source='lib/smbconf/testsuite.c',
deps='''
- talloc
- param
- popt_samba3''',
+ talloc
+ smbconf
+ popt_samba3
+ ''',
install=False)
bld.SAMBA3_BINARY('replacetort',
bld.SAMBA3_BINARY('msgtest',
source='torture/msgtest.c',
deps='''
- talloc
- param''',
+ talloc
+ smbconf
+ ''',
install=False)
bld.SAMBA3_BINARY('msg_sink',
source='torture/msg_sink.c',
deps='''
- talloc
- param''',
+ talloc
+ smbconf
+ ''',
install=False)
bld.SAMBA3_BINARY('msg_source',
source='torture/msg_source.c',
deps='''
- talloc
- param''',
+ talloc
+ smbconf
+ ''',
install=False)
bld.SAMBA3_BINARY('pdbtest',
source='torture/pdbtest.c',
deps='''
- talloc
- pdb
- popt_samba3
- AUTH_COMMON
- auth''',
+ talloc
+ pdb
+ popt_samba3
+ AUTH_COMMON
+ auth
+ ''',
install=False)
bld.SAMBA3_BINARY('vfstest',
- source='''torture/cmd_vfs.c
- torture/vfstest.c
- torture/vfstest_chain.c''',
+ source='''
+ torture/cmd_vfs.c
+ torture/vfstest.c
+ torture/vfstest_chain.c
+ ''',
deps='''
- vfs
- popt_samba3
- SMBREADLINE''',
+ vfs
+ popt_samba3
+ smbconf
+ SMBREADLINE
+ ''',
install=False)
bld.SAMBA3_BINARY('versiontest',
source='lib/version_test.c',
deps='''
- SAMBA_VERSION
- param''',
+ SAMBA_VERSION
+ smbconf
+ ''',
install=False)
bld.SAMBA3_BINARY('timelimit',
bld.SAMBA3_BINARY('rpc_open_tcp',
source='torture/rpc_open_tcp.c',
deps='''
- talloc
- msrpc3''',
+ talloc
+ msrpc3
+ ''',
install=False)
bld.SAMBA3_BINARY('vlp',
source='printing/tests/vlp.c',
deps='''
- talloc
- param''',
+ talloc
+ smbconf
+ ''',
install=False)
bld.SAMBA3_PYTHON('pysmbd',
bld.SAMBA3_BINARY('spotlight2sparql',
source='''
rpc_server/mdssvc/sparql_parser_test.c
- rpc_server/mdssvc/sparql_parser.c
- rpc_server/mdssvc/sparql_lexer.c
+ rpc_server/mdssvc/sparql_parser.y
+ rpc_server/mdssvc/sparql_lexer.l
rpc_server/mdssvc/sparql_mapping.c''',
deps='samba3-util talloc ' + bld.env['libtracker'],
enabled=bld.env.with_spotlight,
bld.RECURSE('auth')
bld.RECURSE('libgpo/gpext')
-bld.RECURSE('lib/pthreadpool')
bld.RECURSE('librpc')
bld.RECURSE('librpc/idl')
bld.RECURSE('libsmb')