summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-23 17:33:04 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-24 03:52:05 +0200
commit9554fd6e2ff12760d463c9464f72cf6b51b7363d (patch)
tree9075d9f65a7cc0f00712c7685f85295486da92a1
parentb332743ddb13e2ce83c7686780c004d638a1b16f (diff)
downloadsamba-9554fd6e2ff12760d463c9464f72cf6b51b7363d.tar.gz
samba-9554fd6e2ff12760d463c9464f72cf6b51b7363d.tar.bz2
samba-9554fd6e2ff12760d463c9464f72cf6b51b7363d.zip
s3-build: Remove SECRETS3 as a samba3core dep
This resolves the the library loop between libsmbconf and SECRETS3/passdb, and allows the next commit to require fully defined symbols in public libraries. Andrew Bartlett
-rwxr-xr-xsource3/wscript_build15
1 files changed, 10 insertions, 5 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 53c412e461..6e31eefff9 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -72,7 +72,7 @@ LIB_SRC = '''
lib/wins_srv.c
lib/util_sid.c
lib/util_file.c
- lib/util.c lib/util_cmdline.c
+ lib/util.c
lib/util_sock.c lib/sock_exec.c
lib/substitute.c lib/substitute_generic.c
lib/ms_fnmatch.c
@@ -743,7 +743,7 @@ if bld.env.toplevel_build:
bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG',
source=PARAM_WITHOUT_REG_SRC,
- deps='''PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX''',
+ deps='''PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX samba3core''',
vars=locals())
bld.SAMBA3_SUBSYSTEM('param',
@@ -785,10 +785,15 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL',
bld.SAMBA3_LIBRARY('POPT_SAMBA3',
source=POPT_LIB_SRC,
- deps='popt samba-util',
+ deps='popt samba-util UTIL_CMDLINE',
vars=locals(),
private_library=True)
+bld.SAMBA3_LIBRARY('UTIL_CMDLINE',
+ source='lib/util_cmdline.c',
+ deps='SECRETS3',
+ private_library=True)
+
bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
source=KRBCLIENT_SRC,
public_deps='KRB5_WRAP k5crypto',
@@ -796,7 +801,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC,
- deps='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 SECRETS3 dbwrap_util util_sec util_malloc memcache ccan',
+ deps='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 util_sec util_malloc memcache ccan',
vars=locals())
bld.SAMBA3_LIBRARY('smbd_shim',
@@ -816,7 +821,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
bld.SAMBA3_LIBRARY('LIBSMB',
source=LIBSMB_SRC,
- deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON',
+ deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON UTIL_CMDLINE',
vars=locals(),
private_library=True)