The branch, master has been updated via 1622ad4 s3-waf: move SERVICES into a subsystem. via f52fda4 s3-waf: add PRINTING subsystems. via cef16c26 s3-waf: add two more REGF based subsystems. from b7cd6af tdb: fix non-WAF build, commit 1.2.6 ABI file.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1622ad414fa13ab373064935a4cedbb75af870e6 Author: Günther Deschner <g...@samba.org> Date: Mon Sep 27 03:47:15 2010 +0200 s3-waf: move SERVICES into a subsystem. Guenther commit f52fda496454b964b20e8b6d48d7c7985dce2686 Author: Günther Deschner <g...@samba.org> Date: Mon Sep 27 03:39:41 2010 +0200 s3-waf: add PRINTING subsystems. Guenther commit cef16c26903a0bb351363ccc4ce6056f5f6e0ddd Author: Günther Deschner <g...@samba.org> Date: Mon Sep 27 03:31:19 2010 +0200 s3-waf: add two more REGF based subsystems. Guenther ----------------------------------------------------------------------- Summary of changes: source3/wscript_build | 68 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 45 insertions(+), 23 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/wscript_build b/source3/wscript_build index ddda2d6..a014887 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -398,6 +398,13 @@ REG_FULL_SRC = '''${REG_SMBCONF_SRC} registry/reg_perfcount.c librpc/gen_ndr/ndr_perfcount.c''' +SERVICES_SRC = '''services/svc_spoolss.c + services/svc_rcinit.c + services/services_db.c + services/svc_netlogon.c + services/svc_winreg.c + services/svc_wins.c''' + LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c''' RPC_STATIC = '' @@ -427,10 +434,7 @@ RPC_WKSSVC_SRC = '''../librpc/gen_ndr/srv_wkssvc.c rpc_server/srv_wkssvc_nt.c''' RPC_SVCCTL_SRC = ''' rpc_server/srv_svcctl_nt.c - ../librpc/gen_ndr/srv_svcctl.c - services/svc_spoolss.c services/svc_rcinit.c services/services_db.c - services/svc_netlogon.c services/svc_winreg.c - services/svc_wins.c''' + ../librpc/gen_ndr/srv_svcctl.c''' RPC_NTSVCS_SRC = '''rpc_server/srv_ntsvcs_nt.c ../librpc/gen_ndr/srv_ntsvcs.c''' @@ -485,8 +489,7 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c''' PROFILE_SRC = '''profile/profile.c''' -PROFILES_SRC = '''utils/profiles.c - ${REGFIO_SRC}''' +PROFILES_SRC = '''utils/profiles.c''' OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c smbd/oplock_onefs.c''' @@ -663,8 +666,6 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c SMBD_SRC_BASE = '''${SMBD_SRC_SRV} ${RPC_SERVER_SRC} - ${PRINTING_SRC} - ${PRINTBACKEND_SRC} ${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC} ${REG_FULL_SRC} ${BUILDOPT_SRC} @@ -679,8 +680,6 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV} rpc_client/init_netlogon.c rpc_client/init_samr.c ${PRIVILEGES_BASIC_SRC} - ${REGFIO_SRC} - ${REG_API_REGF_SRC} ${LIBNDR_XATTR_SRC}''' PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c @@ -693,9 +692,7 @@ PRINTBACKEND_SRC = '''printing/printing.c printing/nt_printing.c printing/nt_printing_tdb.c printing/nt_printing_migrate.c - printing/nt_printing_ads.c - ${LIBNDR_NTPRINTING_SRC} - ${PRINTBASE_SRC}''' + printing/nt_printing_ads.c''' SMBD_SRC = '''${SMBD_SRC_BASE} ${SMBD_SRC_MAIN}''' @@ -717,7 +714,7 @@ NMBD_SRC = '${NMBD_SRC1}' SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c web/swat.c web/neg_lang.c''' -SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC} +SWAT_SRC = '''${SWAT_SRC1} ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC} ${LIBCLI_SAMR_SRC} rpc_client/init_lsa.c''' @@ -725,7 +722,7 @@ SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC} STATUS_SRC = '''utils/status.c utils/status_profile.c ${FNAME_UTIL_SRC}''' -SMBCONTROL_SRC = '''utils/smbcontrol.c ${PRINTBASE_SRC}''' +SMBCONTROL_SRC = '''utils/smbcontrol.c''' SMBTREE_SRC = '''utils/smbtree.c ${LIBCLI_SRVSVC_SRC}''' @@ -883,7 +880,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c utils/net_serverid.c utils/net_eventlog.c utils/net_printing.c - ${LIBNDR_NTPRINTING_SRC} ${LIBNDR_PREG_SRC} ${LIBCLI_SPOOLSS_SRC} ${LIBCLI_WINREG_SRC} @@ -906,8 +902,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c' NET_SRC = '''${NET_SRC1} - ${NET_SRC2} - ${REGFIO_SRC}''' + ${NET_SRC2}''' CUPS_SRC = '''client/smbspool.c''' @@ -1145,6 +1140,14 @@ bld.SAMBA_SUBSYSTEM('PARAM', deps='PARAM_WITHOUT_REG DYNCONFIG', vars=locals()) +bld.SAMBA_SUBSYSTEM('REGFIO', + source=REGFIO_SRC, + vars=locals()) + +bld.SAMBA_SUBSYSTEM('REG_API_REGF', + source=REG_API_REGF_SRC, + vars=locals()) + bld.SAMBA_SUBSYSTEM('POPT_SAMBA', source=POPT_LIB_SRC, vars=locals()) @@ -1220,7 +1223,8 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE', NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER - VFS RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG''', + VFS RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG + REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES''', vars=locals()) bld.SAMBA_SUBSYSTEM('RPC_MODULES', @@ -1243,6 +1247,19 @@ bld.SAMBA_SUBSYSTEM('READLINE', source=READLINE_SRC, vars=locals()) +bld.SAMBA_SUBSYSTEM('PRINTBASE', + source=PRINTBASE_SRC, + vars=locals()) + +bld.SAMBA_SUBSYSTEM('PRINTBACKEND', + source=PRINTBACKEND_SRC, + deps='PRINTBASE NDR_NTPRINTING LIBADS_PRINTER', + vars=locals()) + +bld.SAMBA_SUBSYSTEM('PRINTING', + source=PRINTING_SRC, + vars=locals()) + bld.SAMBA_SUBSYSTEM('PASSWD_UTIL', source=PASSWD_UTIL_SRC, vars=locals()) @@ -1271,6 +1288,10 @@ bld.SAMBA_SUBSYSTEM('LIBEVENTLOG', deps='NDR_EVENTLOG', vars=locals()) +bld.SAMBA_SUBSYSTEM('SERVICES', + source=SERVICES_SRC, + vars=locals()) + bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH', source=PLAINTEXT_AUTH_SRC, vars=locals()) @@ -1356,7 +1377,7 @@ bld.SAMBA_BINARY('web/swat', source=SWAT_SRC, deps='''talloc tevent cap LIBS LIBSMB libwbclient PARAM LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups - LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH''', + LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING''', enabled=bld.env.build_swat, install_path='${SBINDIR}', vars=locals()) @@ -1380,12 +1401,13 @@ bld.SAMBA_BINARY('net', deps='''talloc tdb libnetapi libaddns cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBGPO LIBADS LIBADS_SERVER LIBADS_PRINTER LOCALE_DIR LIBAFS LIBAFS_SETTOKEN READLINE PASSWD_UTIL LIBNET - LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DISPLAY_SEC DCUTIL''', + LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DISPLAY_SEC DCUTIL + REGFIO NDR_NTPRINTING''', vars=locals()) bld.SAMBA_BINARY('profiles', source=PROFILES_SRC, - deps='''talloc tdb cap tevent POPT_SAMBA PARAM LIBS LIBSMB_ERR LIB_NONSMBD''', + deps='''talloc tdb cap tevent POPT_SAMBA PARAM LIBS LIBSMB_ERR LIB_NONSMBD REGFIO''', vars=locals()) bld.SAMBA_BINARY('smbspool', @@ -1415,7 +1437,7 @@ bld.SAMBA_BINARY('smbstatus', bld.SAMBA_BINARY('smbcontrol', source=SMBCONTROL_SRC, - deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''', + deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA PRINTBASE''', vars=locals()) bld.SAMBA_BINARY('smbtree', -- Samba Shared Repository