diff options
| author | Michael Adam <obnox@samba.org> | 2013-09-22 22:49:22 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-09-23 08:14:25 +0200 |
| commit | c442305d4f1c8a33098998da4971063a70c5de2d (patch) | |
| tree | 9c9bc623909220573c73eb1a6a48f6f15161d3ef | |
| parent | a3f25f25113d83a605638fa2806014ad9972f919 (diff) | |
| download | samba-c442305d4f1c8a33098998da4971063a70c5de2d.tar.gz samba-c442305d4f1c8a33098998da4971063a70c5de2d.tar.bz2 samba-c442305d4f1c8a33098998da4971063a70c5de2d.zip | |
build: reorganize idmap_rw and idmap_tdb int subsystems with proper dependencies
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source3/winbindd/wscript_build | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build index aacd859680..7b5dc972b0 100644 --- a/source3/winbindd/wscript_build +++ b/source3/winbindd/wscript_build @@ -14,16 +14,22 @@ IDMAP_HASH_SRC = '''idmap_hash/idmap_hash.c IDMAP_AUTORID_SRC = '''idmap_autorid.c''' -IDMAP_RW_SRC = 'idmap_rw.c' -IDMAP_SRC = 'idmap.c idmap_util.c idmap_tdb_common.c ${IDMAP_RW_SRC}' +IDMAP_SRC = 'idmap.c idmap_util.c' bld.SAMBA3_LIBRARY('idmap', source=IDMAP_SRC, deps='samba-util', - vars=locals(), allow_undefined_symbols=True, private_library=True) +bld.SAMBA3_SUBSYSTEM('IDMAP_RW', + source='idmap_rw.c', + deps='samba-util') + +bld.SAMBA3_SUBSYSTEM('IDMAP_TDB_COMMON', + source='idmap_tdb_common.c', + deps='tdb IDMAP_RW') + bld.SAMBA3_SUBSYSTEM('IDMAP_HASH', source=IDMAP_HASH_SRC, deps='samba-util krb5samba', @@ -72,7 +78,7 @@ bld.SAMBA3_MODULE('idmap_passdb', bld.SAMBA3_MODULE('idmap_ldap', subsystem='idmap', source=IDMAP_LDAP_SRC, - deps='smbldap smbldaphelper pdb', + deps='smbldap smbldaphelper pdb IDMAP_RW', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.CONFIG_SET("HAVE_LDAP"), @@ -89,7 +95,7 @@ bld.SAMBA3_MODULE('idmap_nss', bld.SAMBA3_MODULE('idmap_tdb', subsystem='idmap', source=IDMAP_TDB_SRC, - deps='samba-util tdb', + deps='samba-util tdb IDMAP_TDB_COMMON', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb')) @@ -97,7 +103,7 @@ bld.SAMBA3_MODULE('idmap_tdb', bld.SAMBA3_MODULE('idmap_tdb2', subsystem='idmap', source=IDMAP_TDB2_SRC, - deps='samba-util tdb', + deps='samba-util tdb IDMAP_TDB_COMMON', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb2'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb2')) @@ -114,7 +120,7 @@ bld.SAMBA3_MODULE('idmap_hash', bld.SAMBA3_MODULE('idmap_autorid', subsystem='idmap', source=IDMAP_AUTORID_SRC, - deps='samba-util tdb', + deps='samba-util tdb IDMAP_TDB_COMMON', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_autorid'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid'), |