s3-lib: Fix util_cmdline which doesn't use popt.

[nivanova/samba-autobuild/.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index fb4b2b0dfed042229f42ea299dae7ea79aa31a4c..5df95197bf56bec02b61bd3f7c1067ec72aa5e0f 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -223,7 +223,7 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/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 ${SERVER_MUTEX_SRC}
+                lib/util_nscd.c lib/winbind_util.c
                 passdb/pdb_util.c passdb/pdb_interface.c
                 passdb/pdb_ldap_schema.c
                 passdb/pdb_secrets.c'''
@@ -499,8 +499,6 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
 
 LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
 
-# FIXME:  bigballofmud
-
 CLIENT_SRC1 = '''client/client.c client/clitar.c
                  client/dnsbrowse.c'''
 
@@ -645,6 +643,7 @@ bld.SAMBA3_LIBRARY('netapi',
                     source=LIBNETAPI_SRC,
                     public_deps='''
                     talloc
+                    util_cmdline
                     msrpc3
                     ads
                     NDR_LIBNETAPI
@@ -693,7 +692,7 @@ bld.SAMBA3_LIBRARY('nss_wins',
 
 bld.SAMBA3_LIBRARY('gse',
                    source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
-                   deps='KRB5_WRAP gensec param KRBCLIENT SECRETS3',
+                   deps='KRB5_WRAP gensec param KRBCLIENT secrets3',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('msrpc3',
@@ -726,7 +725,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
 
 bld.SAMBA3_LIBRARY('pdb',
                    source=PASSDB_SRC,
-                   deps='SECRETS3 GROUPDB wbclient LIBCLI_AUTH flag_mapping',
+                   deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping',
                    private_library=True,
                    public_headers='''
                                include/passdb.h
@@ -734,6 +733,9 @@ bld.SAMBA3_LIBRARY('pdb',
                                passdb/lookup_sid.h''',
                    vars=locals())
 
+bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
+                     source=SERVER_MUTEX_SRC)
+
 bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
                     source=PARAM_UTIL_SRC)
 
@@ -798,7 +800,7 @@ bld.SAMBA3_LIBRARY('popt_samba3',
 
 bld.SAMBA3_LIBRARY('util_cmdline',
                    source='lib/util_cmdline.c',
-                   deps='SECRETS3 popt',
+                   deps='secrets3',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
@@ -840,7 +842,7 @@ bld.SAMBA3_LIBRARY('smbd_shim',
 
 bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
                     source=LIBNTLMSSP_SRC,
-                    deps='NDR_NTLMSSP NTLMSSP_COMMON',
+                    deps='NDR_NTLMSSP NTLMSSP_COMMON wbclient',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('auth_generic',
@@ -869,9 +871,13 @@ bld.SAMBA3_SUBSYSTEM('CLDAP',
                     deps='cli-ldap-common cli_cldap LIBTSOCKET',
                     vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('SECRETS3',
+# NOTE: The secrets3 library is a low level library used by several subsystems.
+# PLEASE DO NOT make it depend on high level libraries like PDB, if you are
+# doing that your design is wrong and needs changing. -SSS
+bld.SAMBA3_LIBRARY('secrets3',
                    source=SECRETS_SRC,
-                   deps='NDR_SECRETS param samba3util dbwrap pdb',
+                   deps='NDR_SECRETS param samba3util dbwrap',
+                   private_library=True,
                    vars=locals())
 
 bld.SAMBA3_LIBRARY('smbldap',
@@ -890,7 +896,7 @@ bld.SAMBA3_LIBRARY('ads',
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,
-                    deps='ndr-krb5pac KRB5_WRAP',
+                    deps='SERVER_MUTEX ndr-krb5pac KRB5_WRAP',
                    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
@@ -937,59 +943,26 @@ bld.SAMBA3_LIBRARY('smbd_conn',
 bld.SAMBA3_LIBRARY('smbd_base',
                     source=SMBD_SRC_BASE,
                     deps='''
+                    talloc
                     tevent
-                    dl
-                    krb5
-                    ldap
-                    gssapi
-                    gssapi_krb5
-                    samba-util
-                    wbclient
-                    crypt
-                    nsl
-                    cups
-                    cap
-                    z
                     pdb
-                    param
-                    samba3core
                     libsmb
-                    popt_samba3
-                    KRBCLIENT
-                    AVAHI
-                    ndr-standard
                     msrpc3
-                    ads
-                    LIBADS_SERVER
-                    LIBADS_PRINTER
                     vfs
                     vfs_default
                     vfs_posixacl
-                    auth
+                    popt_samba3
+                    samba3core
+                    smbd_conn
+                    param_service
+                    AVAHI
+                    PRINTBASE
+                    PROFILE
                     LOCKING
+                    LIBADS_SERVER
                     LIBAFS
                     LIBAFS_SETTOKEN
-                    PROFILE
-                    PRINTING
-                    PRINTBACKEND
-                    NDR_XATTR
-                    NDR_NOTIFY
-                    REGFIO
-                    smbconf
-                    REG_FULL
-                    FNAME_UTIL
-                    NDR_OPEN_FILES
-                    libcli_lsa3
-                    cli_spoolss
-                    RPC_NDR_SRVSVC
-                    npa_tstream
-                    INIT_SAMR
-                    cli_smb_common
                     RPC_SERVER
-                    smbd_conn
-                    param_service
-                    smbd_shim
-                    NDR_DFSBLOBS
                     ''',
                     private_library=True,
                     vars=locals())
@@ -1026,7 +999,7 @@ bld.SAMBA3_LIBRARY('printing_migrate',
 
 bld.SAMBA3_SUBSYSTEM('PRINTING',
                     source=PRINTING_SRC,
-                    deps='NDR_PRINTCAP tdb',
+                    deps='NDR_PRINTCAP tdb cups',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
@@ -1041,7 +1014,7 @@ bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
 
 bld.SAMBA3_SUBSYSTEM('LIBNET',
                     source=LIBNET_SRC,
-                    deps='NDR_LIBNET_JOIN net_keytab',
+                    deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb',
                     vars=locals())
 
 bld.SAMBA3_LIBRARY('net_keytab',
@@ -1105,7 +1078,7 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL',
 
 bld.SAMBA3_LIBRARY('trusts_util',
                    source='libsmb/trusts_util.c',
-                   deps='libcli_netlogon3 msrpc3',
+                   deps='libcli_netlogon3 msrpc3 pdb',
                    vars=locals(),
                    private_library=True)
 
@@ -1161,7 +1134,7 @@ bld.SAMBA3_LIBRARY('CHARSET3',
 
 bld.SAMBA3_SUBSYSTEM('errors3',
                      source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
-                     deps='errors')
+                     deps='errors gssapi')
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
                     source=LIBCLI_SAMR_SRC,
@@ -1179,7 +1152,7 @@ bld.SAMBA3_LIBRARY('libcli_netlogon3',
 
 bld.SAMBA3_LIBRARY('cli_spoolss',
                    source=LIBCLI_SPOOLSS_SRC,
-                   deps='RPC_NDR_SPOOLSS param SECRETS3',
+                   deps='RPC_NDR_SPOOLSS param secrets3',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
@@ -1232,39 +1205,24 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  deps='''
                  talloc
                  tevent
-                 dl
                  pdb
-                 ldap
-                 param
-                 libsmb
                  popt_samba3
-                 KRBCLIENT
-                 ndr-standard
-                 msrpc3
-                 ads
-                 LIBADS_SERVER
-                 SRV_NDR_WBINT
-                 RPC_NDR_WBINT
-                 NDR_WBINT
-                 LIBAFS
-                 PROFILE
-                 SLCACHE
-                 DCUTIL
                  idmap
+                 ads
+                 msrpc3
                  nss_info
-                 TOKEN_UTIL
+                 LIBAFS
+                 LIBADS_SERVER
                  LIBCLI_SAMR
-                 libcli_lsa3
-                 libcli_netlogon3
+                 SLCACHE
                  RPC_NDR_DSSETUP
-                 npa_tstream
-                 RPC_NCACN_NP
-                 RPC_PIPE_REGISTER
+                 RPC_NDR_WBINT
+                 SRV_NDR_WBINT
                  RPC_SAMR
                  RPC_LSARPC
-                 PAM_ERRORS
+                 RPC_NCACN_NP
+                 RPC_PIPE_REGISTER
                  WB_REQTRANS
-                 auth
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',
@@ -1285,7 +1243,7 @@ bld.SAMBA3_BINARY('web/swat',
                  PASSCHANGE
                  PRINTBASE
                  PRINTING
-                 cups''',
+                 ''',
                  enabled=bld.env.build_swat,
                  install_path='${SBINDIR}',
                  vars=locals())
@@ -1370,7 +1328,6 @@ bld.SAMBA3_BINARY('net',
                  RPC_NDR_SVCCTL
                  RPC_NDR_DSSETUP
                  RPC_NDR_INITSHUTDOWN
-                 INIT_SAMR
                  printing_migrate
                  trusts_util''',
                  vars=locals())
@@ -1406,7 +1363,7 @@ bld.SAMBA3_BINARY('smbta-util',
                  source=SMBTA_UTIL_SRC,
                  deps='''
                  talloc
-                 SECRETS3
+                 secrets3
                  param''',
                  vars=locals())
 
@@ -1465,6 +1422,7 @@ bld.SAMBA3_BINARY('smbget',
                  source=SMBGET_SRC,
                  deps='''
                  talloc
+                 popt_samba3
                  smbclient''',
                  vars=locals())