[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  783264e s3-waf: fix LIBNBT deps.
       via  c5559bb s3-waf: convert IDMAP_AD into a subsystem.
       via  3a91e40 s3-waf: convert IDMAP_HASH into a subsystem.
       via  e702b54 s3-waf: convert IDMAP_ADEX into a subsystem.
      from  88b61a3 s3-waf: no need to compile ../librpc/ndr/ndr_compression.c twice.

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


- Log -----------------------------------------------------------------
commit 783264e97c5230063abc601bc7f90c752141a9d6
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 30 21:50:56 2010 +0100

    s3-waf: fix LIBNBT deps.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Nov 30 22:39:05 CET 2010 on sn-devel-104

commit c5559bb7ea6ea95ef333f1deb0bedfec10be39b7
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 30 21:46:31 2010 +0100

    s3-waf: convert IDMAP_AD into a subsystem.
    
    Guenther

commit 3a91e407cb4034442150559980ba87db55ba6739
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 30 21:44:25 2010 +0100

    s3-waf: convert IDMAP_HASH into a subsystem.
    
    Guenther

commit e702b54cf83cde07512e1fea151b589fc07638c6
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 30 21:42:17 2010 +0100

    s3-waf: convert IDMAP_ADEX into a subsystem.
    
    Guenther

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

Summary of changes:
 source3/winbindd/wscript_build |   36 ++++++++++++++++++++++++++++--------
 source3/wscript_build          |    4 ++--
 2 files changed, 30 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index da0c189..4ad898c 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -26,9 +26,22 @@ bld.SAMBA_SUBSYSTEM('idmap',
                     source=IDMAP_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('IDMAP_ADEX',
+                    source=IDMAP_ADEX_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('IDMAP_HASH',
+                    source=IDMAP_HASH_SRC,
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('IDMAP_AD',
+                    source=IDMAP_AD_SRC,
+                    vars=locals())
+
 bld.SAMBA_MODULE('idmap_ad',
                  subsystem='idmap',
-                 source=IDMAP_AD_SRC,
+                 source='',
+                 deps='IDMAP_AD',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
@@ -77,14 +90,16 @@ bld.SAMBA_MODULE('idmap_tdb2',
 
 bld.SAMBA_MODULE('idmap_hash',
                  subsystem='idmap',
-                 source=IDMAP_HASH_SRC,
+                 source='',
+                 deps='IDMAP_HASH',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH'))
 
 bld.SAMBA_MODULE('idmap_adex',
                  subsystem='idmap',
-                 source=IDMAP_ADEX_SRC,
+                 source='',
+                 deps='IDMAP_ADEX',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
@@ -113,35 +128,40 @@ bld.SAMBA_MODULE('nss_info_template',
 
 bld.SAMBA_MODULE('nss_info_adex',
                  subsystem='nss_info',
-                 source=IDMAP_ADEX_SRC,
+                 source='',
+                 deps='IDMAP_ADEX',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
 
 bld.SAMBA_MODULE('nss_info_hash',
                  subsystem='nss_info',
-                 source=IDMAP_HASH_SRC,
+                 source='',
+                 deps='IDMAP_HASH',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH'))
 
 bld.SAMBA_MODULE('nss_info_rfc2307',
                  subsystem='nss_info',
-                 source=IDMAP_AD_SRC,
+                 source='',
+                 deps='IDMAP_AD',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
 
 bld.SAMBA_MODULE('nss_info_sfu20',
                  subsystem='nss_info',
-                 source=IDMAP_AD_SRC,
+                 source='',
+                 deps='IDMAP_AD',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
 
 bld.SAMBA_MODULE('nss_info_sfu',
                  subsystem='nss_info',
-                 source=IDMAP_AD_SRC,
+                 source='',
+                 deps='IDMAP_AD',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
diff --git a/source3/wscript_build b/source3/wscript_build
index 7e8af30..18ecf3c 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -925,7 +925,7 @@ bld.SAMBA_SUBSYSTEM('LIBSMB',
 
 bld.SAMBA_SUBSYSTEM('LIBDRSUAPI',
                     source=DRSUAPI_SRC,
-                    deps='z LZXPRESS NDR_SVCCTL NDR_NBT NDR_DRSUAPI NDR_DRSBLOBS',
+                    deps='z LZXPRESS NDR_DRSUAPI NDR_DRSBLOBS',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('CLDAP',
@@ -1040,7 +1040,7 @@ bld.SAMBA_SUBSYSTEM('LIBNMB',
 
 bld.SAMBA_SUBSYSTEM('LIBNBT',
                     source=LIBNBT_SRC,
-                    deps='NDR_NBT_BUF LIBCLI_NDR_NETLOGON',
+                    deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NDR_NETLOGON',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SERVICES',


-- 
Samba Shared Repository