[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  4ebf2f9 s3-waf: convert SAMBA_VERSION into a subsystem.
       via  589d1bf s3-waf: convert PASSCHANGE into a subsystem.
       via  3459649 s3-waf: add UTIL_TDB subsystem.
      from  d2e93cc s3-waf: Fixed the static rpc service build.

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


- Log -----------------------------------------------------------------
commit 4ebf2f97459b4214748255aa1f40015f8dc511cc
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 4 13:11:35 2011 +0100

    s3-waf: convert SAMBA_VERSION into a subsystem.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Jan  4 15:10:52 CET 2011 on sn-devel-104

commit 589d1bf57eb8f561de3cf2a05990a5d2edf69095
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 4 13:05:51 2011 +0100

    s3-waf: convert PASSCHANGE into a subsystem.
    
    Guenther

commit 34596493bada8ce9fb00fd7d4d60ac245a71d5e6
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 4 12:56:29 2011 +0100

    s3-waf: add UTIL_TDB subsystem.
    
    Guenther

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

Summary of changes:
 source3/wscript_build |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index 21da069..d670ecb 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,7 +3,7 @@
 from samba_utils import *
 import samba_version
 
-TDB_LIB_SRC = '''../lib/util/util_tdb.c
+TDB_LIB_SRC = '''
           lib/dbwrap.c lib/dbwrap_tdb.c
           lib/dbwrap_ctdb.c
           lib/g_lock.c
@@ -87,7 +87,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
           lib/serverid.c
           lib/util_transfer_file.c
           ${TDB_LIB_SRC}
-          ${VERSION_SRC} lib/debug.c lib/fault.c
+          lib/debug.c lib/fault.c
           lib/interface.c lib/pidfile.c
           lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
           lib/username.c
@@ -476,8 +476,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}
-           ${PASSCHANGE_SRC}'''
+SWAT_SRC = '''${SWAT_SRC1}'''
 
 STATUS_SRC = '''utils/status.c utils/status_profile.c'''
 
@@ -493,7 +492,7 @@ TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
 
 PASSWD_UTIL_SRC = 'utils/passwd_util.c'
 
-SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}'''
+SMBPASSWD_SRC = '''utils/smbpasswd.c'''
 
 PDBEDIT_SRC = '''utils/pdbedit.c'''
 
@@ -673,9 +672,7 @@ NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
                 libsmb/clikrb5.c libads/kerberos.c'''
 
 
-VLP_SRC = '''printing/tests/vlp.c
-          ../lib/util/util_tdb.c
-          ${LIBSAMBAUTIL_SRC}'''
+VLP_SRC = '''printing/tests/vlp.c'''
 
 RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
 
@@ -866,7 +863,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
-                    deps='LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET',
+                    deps='LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB SAMBA_VERSION',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -981,6 +978,12 @@ bld.SAMBA_SUBSYSTEM('FNAME_UTIL',
                     source=FNAME_UTIL_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('UTIL_TDB',
+	source='../lib/util/util_tdb.c',
+	local_include=False,
+	public_deps='tdb talloc'
+	)
+
 bld.SAMBA_SUBSYSTEM('LIBNET',
                     source=LIBNET_SRC,
                     deps='NDR_LIBNET_JOIN',
@@ -1019,6 +1022,15 @@ bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH',
                     deps='pam',
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('PASSCHANGE',
+                    source=PASSCHANGE_SRC,
+                    deps='LIBCLI_SAMR',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('SAMBA_VERSION',
+                    source=VERSION_SRC,
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('SLCACHE',
                     source=SLCACHE_SRC,
                     vars=locals())
@@ -1219,7 +1231,7 @@ bld.SAMBA_BINARY('web/swat',
                  deps='''talloc tevent cap LIBS LIBSMB wbclient PARAM
                  LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
                  LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL
-                 LIBCLI_SAMR INIT_LSA''',
+                 LIBCLI_SAMR INIT_LSA PASSCHANGE''',
                  enabled=bld.env.build_swat,
                  install_path='${SBINDIR}',
                  vars=locals())
@@ -1304,7 +1316,7 @@ bld.SAMBA_BINARY('smbpasswd',
                  source=SMBPASSWD_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
                  LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PASSWD_UTIL
-                 LIBCLI_SAMR INIT_LSA''',
+                 LIBCLI_SAMR INIT_LSA PASSCHANGE''',
                  vars=locals())
 
 bld.SAMBA_BINARY('pdbedit',
@@ -1421,7 +1433,8 @@ bld.SAMBA_BINARY('smbfilter',
                  vars=locals())
 
 bld.SAMBA_BINARY('versiontest',
-                 source='lib/version_test.c ${VERSION_SRC}',
+                 source='lib/version_test.c',
+                 deps='SAMBA_VERSION',
                  vars=locals())
 
 bld.SAMBA_BINARY('wbinfo',
@@ -1473,7 +1486,7 @@ bld.SAMBA_BINARY('split_tokens',
 
 bld.SAMBA_BINARY('vlp',
                  source=VLP_SRC,
-                 deps='''talloc tdb PARAM_UTIL''',
+                 deps='''talloc tdb PARAM_UTIL UTIL_TDB''',
                  vars=locals())
 
 swat_files=recursive_dirlist('../swat', '../swat', '*')


-- 
Samba Shared Repository