summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2012-01-12 13:39:17 +0100
committerAndreas Schneider <asn@samba.org>2012-01-12 15:55:46 +0100
commit9bafbf99947d24c8e9fad7e8927cfbe4060d6079 (patch)
treee82ca802213e6349233615770e0f7f594352d5b5
parent0f14ac40a29bb23bb0a417df4bbeee009400f33e (diff)
downloadsamba-9bafbf99947d24c8e9fad7e8927cfbe4060d6079.tar.gz
samba-9bafbf99947d24c8e9fad7e8927cfbe4060d6079.tar.bz2
samba-9bafbf99947d24c8e9fad7e8927cfbe4060d6079.zip
s3-waf: Create a smaller samba3util subsystem.
-rwxr-xr-xsource3/wscript_build25
1 files changed, 18 insertions, 7 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 12e6fb9195..53b21c695b 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -48,20 +48,14 @@ LIB_SRC = '''
lib/id_cache.c
lib/talloc_dict.c
lib/serverid.c
- lib/util_transfer_file.c
lib/addrchange.c
${TDB_LIB_SRC}
../lib/util/debug_s3.c
lib/dumpcore.c
lib/interface.c lib/pidfile.c
- lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
lib/username.c
lib/access.c lib/smbrun.c
lib/wins_srv.c
- lib/util_sid.c
- lib/util_file.c
- lib/util.c
- lib/util_sock.c lib/sock_exec.c
lib/substitute.c lib/substitute_generic.c
lib/ms_fnmatch.c
lib/tallocmsg.c lib/dmallocmsg.c
@@ -77,6 +71,18 @@ LIB_SRC = '''
libads/krb5_errs.c lib/system_smbd.c lib/audit.c
lib/file_id.c lib/idmap_cache.c'''
+LIB_UTIL_SRC = '''
+ lib/system.c
+ lib/sendfile.c
+ lib/recvfile.c
+ lib/time.c
+ lib/util_sid.c
+ lib/util_file.c
+ lib/util.c
+ lib/util_sock.c
+ lib/util_transfer_file.c
+ lib/sock_exec.c'''
+
POPT_LIB_SRC = '''lib/popt_common.c'''
PARAM_UTIL_SRC = '''param/util.c'''
@@ -796,9 +802,14 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
public_deps='KRB5_WRAP k5crypto LIBTSOCKET CLDAP',
vars=locals())
+bld.SAMBA3_SUBSYSTEM('samba3util',
+ source=LIB_UTIL_SRC,
+ deps='ndr security NDR_SECURITY samba-util',
+ vars=locals())
+
bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC,
- deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-modules',
+ deps='samba3util LIBTSOCKET LIBCRYPTO NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-modules',
vars=locals())
bld.SAMBA3_LIBRARY('smbd_shim',