summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-10-12 00:26:03 +0200
committerGünther Deschner <gd@samba.org>2010-10-18 15:57:03 +0200
commit10f95a4f1a5f08c5b58b5f5d10921d792997c352 (patch)
tree5125c9c5250a30201844d45898f0f53b04c0566a /source3
parent20c7e2b3a37c624995bb515e65052d0a106b6ebc (diff)
downloadsamba-10f95a4f1a5f08c5b58b5f5d10921d792997c352.tar.gz
samba-10f95a4f1a5f08c5b58b5f5d10921d792997c352.tar.bz2
samba-10f95a4f1a5f08c5b58b5f5d10921d792997c352.zip
s3-waf: fix pdb modules build.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/wscript_build27
-rw-r--r--source3/wscript_build4
2 files changed, 15 insertions, 16 deletions
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index d4a6f5719b..665b759092 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -1,48 +1,47 @@
#!/usr/bin/env python
-PDB_STATIC = ''
PDB_TDBSAM_SRC = 'pdb_tdb.c'
PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c'
PDB_ADS_SRC = 'pdb_ads.c'
PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
-bld.SAMBA_SUBSYSTEM('PDB',
- source='',
- deps='''PDB_TDBSAM PDB_LDAP PDB_ADS PDB_SMBPASSWD PDB_WBC_SAM''',
+bld.SAMBA_SUBSYSTEM('pdb',
+ source='pdb_interface.c',
+ deps='',
vars=locals())
-bld.SAMBA_MODULE('PDB_TDBSAM',
- subsystem='PDB',
+bld.SAMBA_MODULE('pdb_tdbsam',
+ subsystem='pdb',
source=PDB_TDBSAM_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_TDBSAM'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_TDBSAM'))
-bld.SAMBA_MODULE('PDB_LDAP',
- subsystem='PDB',
+bld.SAMBA_MODULE('pdb_ldap',
+ subsystem='pdb',
source=PDB_LDAP_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_LDAP'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_LDAP'))
-bld.SAMBA_MODULE('PDB_ADS',
- subsystem='PDB',
+bld.SAMBA_MODULE('pdb_ads',
+ subsystem='pdb',
source=PDB_ADS_SRC,
deps='LIBCLI_LDAP_NDR',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_ADS'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_ADS'))
-bld.SAMBA_MODULE('PDB_SMBPASSWD',
- subsystem='PDB',
+bld.SAMBA_MODULE('pdb_smbpasswd',
+ subsystem='pdb',
source=PDB_SMBPASSWD_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_SMBPASSWD'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_SMBPASSWD'))
-bld.SAMBA_MODULE('PDB_WBC_SAM',
- subsystem='PDB',
+bld.SAMBA_MODULE('pdb_wbc_sam',
+ subsystem='pdb',
source=PDB_WBC_SAM_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_WBC_SAM'),
diff --git a/source3/wscript_build b/source3/wscript_build
index dce16e3871..8cf82740ca 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -451,7 +451,7 @@ PRIVILEGES_SRC = '''lib/privileges.c'''
PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
-PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
+PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
passdb/util_unixsids.c passdb/lookup_sid.c
passdb/login_cache.c
@@ -1086,7 +1086,7 @@ bld.SAMBA_SUBSYSTEM('TLDAP',
bld.SAMBA_SUBSYSTEM('PASSDB',
source=PASSDB_SRC,
- deps='''GROUPDB TLDAP SECRETS SMBLDAP PDB''',
+ deps='''GROUPDB TLDAP SECRETS SMBLDAP pdb''',
vars=locals())
bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',