summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-09 15:56:20 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 16:46:41 +1100
commitc8b2b109760b366bee6dcf7c6c306936d271f508 (patch)
treef09769354164d60db9e0b237c9a8c4e0028aef2f /source3/winbindd
parente92922308b5636d1b23fa44f1f8aa50413d48d77 (diff)
downloadsamba-c8b2b109760b366bee6dcf7c6c306936d271f508.tar.gz
samba-c8b2b109760b366bee6dcf7c6c306936d271f508.tar.bz2
samba-c8b2b109760b366bee6dcf7c6c306936d271f508.zip
s3-waf: use SAMBA3_*() build rules in source3/build
this brings the s3 waf build much closer to the proposed s3build top level build, using the same bld.SAMBA3_*() rules There are a few renames of subsystems in here, with a 3 suffix where it would create a conflict. Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/wscript_build42
1 files changed, 21 insertions, 21 deletions
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index bb2ae3f52f..dbae11697e 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -22,25 +22,25 @@ IDMAP_AUTORID_SRC = '''idmap_autorid.c'''
IDMAP_RW_SRC = 'idmap_rw.c'
IDMAP_SRC = 'idmap.c idmap_util.c ${IDMAP_RW_SRC}'
-bld.SAMBA_SUBSYSTEM('idmap',
+bld.SAMBA3_SUBSYSTEM('idmap',
source=IDMAP_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('IDMAP_ADEX',
+bld.SAMBA3_SUBSYSTEM('IDMAP_ADEX',
source=IDMAP_ADEX_SRC,
vars=locals(),
enabled=bld.env.HAVE_LDAP)
-bld.SAMBA_SUBSYSTEM('IDMAP_HASH',
+bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
source=IDMAP_HASH_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('IDMAP_AD',
+bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
source=IDMAP_AD_SRC,
vars=locals(),
enabled=bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('idmap_ad',
+bld.SAMBA3_MODULE('idmap_ad',
subsystem='idmap',
source='',
deps='IDMAP_AD',
@@ -48,49 +48,49 @@ bld.SAMBA_MODULE('idmap_ad',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad' and bld.env.HAVE_LDAP))
-bld.SAMBA_MODULE('idmap_rid',
+bld.SAMBA3_MODULE('idmap_rid',
subsystem='idmap',
source=IDMAP_RID_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_rid'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_rid'))
-bld.SAMBA_MODULE('idmap_passdb',
+bld.SAMBA3_MODULE('idmap_passdb',
subsystem='idmap',
source=IDMAP_PASSDB_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_passdb'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_passdb'))
-bld.SAMBA_MODULE('idmap_ldap',
+bld.SAMBA3_MODULE('idmap_ldap',
subsystem='idmap',
source=IDMAP_LDAP_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('idmap_nss',
+bld.SAMBA3_MODULE('idmap_nss',
subsystem='idmap',
source=IDMAP_NSS_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_nss'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_nss'))
-bld.SAMBA_MODULE('idmap_tdb',
+bld.SAMBA3_MODULE('idmap_tdb',
subsystem='idmap',
source=IDMAP_TDB_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb'))
-bld.SAMBA_MODULE('idmap_tdb2',
+bld.SAMBA3_MODULE('idmap_tdb2',
subsystem='idmap',
source=IDMAP_TDB2_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb2'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb2'))
-bld.SAMBA_MODULE('idmap_hash',
+bld.SAMBA3_MODULE('idmap_hash',
subsystem='idmap',
source='',
deps='IDMAP_HASH',
@@ -98,7 +98,7 @@ bld.SAMBA_MODULE('idmap_hash',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_hash'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_hash'))
-bld.SAMBA_MODULE('idmap_adex',
+bld.SAMBA3_MODULE('idmap_adex',
subsystem='idmap',
source='',
deps='IDMAP_ADEX',
@@ -106,7 +106,7 @@ bld.SAMBA_MODULE('idmap_adex',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_adex'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('idmap_autorid',
+bld.SAMBA3_MODULE('idmap_autorid',
subsystem='idmap',
source=IDMAP_AUTORID_SRC,
init_function='',
@@ -117,18 +117,18 @@ bld.SAMBA_MODULE('idmap_autorid',
NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c'
NSS_INFO_SRC = 'nss_info.c'
-bld.SAMBA_SUBSYSTEM('nss_info',
+bld.SAMBA3_SUBSYSTEM('nss_info',
source=NSS_INFO_SRC,
vars=locals())
-bld.SAMBA_MODULE('nss_info_template',
+bld.SAMBA3_MODULE('nss_info_template',
subsystem='nss_info',
source=NSS_INFO_TEMPLATE_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('nss_info_template'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('nss_info_template'))
-bld.SAMBA_MODULE('nss_info_adex',
+bld.SAMBA3_MODULE('nss_info_adex',
subsystem='nss_info',
source='',
deps='IDMAP_ADEX',
@@ -136,7 +136,7 @@ bld.SAMBA_MODULE('nss_info_adex',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_adex'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('nss_info_hash',
+bld.SAMBA3_MODULE('nss_info_hash',
subsystem='nss_info',
source='',
deps='IDMAP_HASH',
@@ -144,7 +144,7 @@ bld.SAMBA_MODULE('nss_info_hash',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_hash'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_hash'))
-bld.SAMBA_MODULE('nss_info_rfc2307',
+bld.SAMBA3_MODULE('nss_info_rfc2307',
subsystem='nss_info',
source='',
deps='IDMAP_AD',
@@ -152,7 +152,7 @@ bld.SAMBA_MODULE('nss_info_rfc2307',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('nss_info_sfu20',
+bld.SAMBA3_MODULE('nss_info_sfu20',
subsystem='nss_info',
source='',
deps='IDMAP_AD',
@@ -160,7 +160,7 @@ bld.SAMBA_MODULE('nss_info_sfu20',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
-bld.SAMBA_MODULE('nss_info_sfu',
+bld.SAMBA3_MODULE('nss_info_sfu',
subsystem='nss_info',
source='',
deps='IDMAP_AD',