[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Thu Sep 23 01:50:50 MDT 2010


The branch, master has been updated
       via  dc4920b s3-waf: rework libnetapi to have no unresolved symbols.
       via  4d75255 s3-waf: add libsmbsharemodes.so.
      from  8ccbbe0 lib-subunit: fixed build on systems without subunit devel library

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit dc4920bfa7f55e660c9944049ba0dd66931abcde
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 00:48:16 2010 -0700

    s3-waf: rework libnetapi to have no unresolved symbols.
    
    Guenther

commit 4d7525537a0090273d85f468af338668920c8dcf
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 00:27:34 2010 -0700

    s3-waf: add libsmbsharemodes.so.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript_build |   62 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index df646bd..e0b3ce2 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -951,6 +951,42 @@ LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}
 
 LIBSMBCLIENT_SRC = '${LIBSMBCLIENT_SRC1}'
 
+LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
+
+LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
+
+LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
+                    lib/netapi/cm.c
+                    librpc/gen_ndr/ndr_libnetapi.c
+                    lib/netapi/libnetapi.c
+                    lib/netapi/joindomain.c
+                    lib/netapi/serverinfo.c
+                    lib/netapi/getdc.c
+                    lib/netapi/user.c
+                    lib/netapi/group.c
+                    lib/netapi/localgroup.c
+                    lib/netapi/samr.c
+                    lib/netapi/sid.c
+                    lib/netapi/share.c
+                    lib/netapi/file.c
+                    lib/netapi/shutdown.c
+                    lib/netapi/netlogon.c'''
+
+LIBNETAPI_SRC = '''${LIBNETAPI_SRC0} ${LIBNET_SRC}
+                   ${LIBSMBCONF_SRC}
+                   ${REG_SMBCONF_SRC}
+                   ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+                   ${DCUTIL_SRC} ${LIBADS_SRC} ${PRIVILEGES_BASIC_SRC}
+                   auth/token_util.c
+                   ${LIBCLI_INITSHUTDOWN_SRC}
+                   ${LIBCLI_WKSSVC_SRC}
+                   ${LIBCLI_SRVSVC_SRC}
+                   ${LIBCLI_LSA_SRC}
+                   ${LIBCLI_SAMR_SRC}
+                   ${LIBCLI_NETLOGON_SRC}
+                   ${RPC_CLIENT_SCHANNEL_SRC}
+                   rpc_client/init_netlogon.c
+                   rpc_client/init_samr.c'''
 
 # FIXME:  bigballofmud
 
@@ -1201,29 +1237,21 @@ bld.SAMBA_LIBRARY('libwbclient',
                     public_deps='talloc WBCOMMON')
 
 bld.SAMBA_LIBRARY('libnetapi',
-                    source='''lib/netapi/netapi.c
-                              lib/netapi/cm.c
-                              librpc/gen_ndr/ndr_libnetapi.c
-                              lib/netapi/libnetapi.c
-                              lib/netapi/joindomain.c
-                              lib/netapi/serverinfo.c
-                              lib/netapi/getdc.c
-                              lib/netapi/user.c
-                              lib/netapi/group.c
-                              lib/netapi/localgroup.c
-                              lib/netapi/samr.c
-                              lib/netapi/sid.c
-                              lib/netapi/share.c
-                              lib/netapi/file.c
-                              lib/netapi/shutdown.c
-                              lib/netapi/netlogon.c''',
-                    public_deps='''talloc tdb''')
+                    source=LIBNETAPI_SRC,
+                    public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
+                    PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG''',
+                    vars=locals())
 
 bld.SAMBA_LIBRARY('libsmbclient',
                     source=LIBSMBCLIENT_SRC,
                     public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB''',
                     vars=locals())
 
+bld.SAMBA_LIBRARY('libsmbsharemodes',
+                    source=LIBSMBSHAREMODES_SRC,
+                    public_deps='''talloc tdb''',
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
                     source='../lib/util/asn1.c',
                     deps='talloc',


-- 
Samba Shared Repository


More information about the samba-cvs mailing list