From 3f64a2a1f4950f18c8e06a89425093a32531badf Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 23 Sep 2013 08:54:58 +0200 Subject: build: list sources of lib pdb directly in def, removing vars=locals() Also, remove a comment "#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC" while moving he list: lib/winbind_util.c is in fact a winbind wrapper for passdb. Signed-off-by: Michael Adam Reviewed-by: Andrew Bartlett --- source3/wscript_build | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/source3/wscript_build b/source3/wscript_build index 8f54fd7690..dd889da104 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -3,21 +3,7 @@ from samba_utils import * import samba_version, samba3 -PRIVILEGES_SRC = '''lib/privileges.c''' - -PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c''' - -PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c - lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c - lib/util_sid_passdb.c - lib/util_unixsids.c passdb/lookup_sid.c - passdb/login_cache.c - passdb/account_pol.c ${PRIVILEGES_SRC} - lib/util_nscd.c lib/winbind_util.c - passdb/pdb_util.c passdb/pdb_interface.c - passdb/pdb_secrets.c - passdb/pdb_unixid.c''' -#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC + GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c''' @@ -421,19 +407,34 @@ private_pdb_match = private_pdb_match + ldapsam_pdb_match private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match) bld.SAMBA3_LIBRARY('pdb', - source=PASSDB_SRC, + source='''passdb/pdb_get_set.c + passdb/passdb.c + lib/util_wellknown.c + lib/util_builtin.c + passdb/pdb_compat.c + lib/util_sid_passdb.c + lib/util_unixsids.c + passdb/lookup_sid.c + passdb/login_cache.c + passdb/account_pol.c + lib/privileges.c + lib/util_nscd.c + lib/winbind_util.c + passdb/pdb_util.c + passdb/pdb_interface.c + passdb/pdb_secrets.c + passdb/pdb_unixid.c''', deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping', private_library=False, pc_files=[], public_headers_install=True, public_headers=''' - include/passdb.h - passdb/machine_sid.h - passdb/lookup_sid.h''', + include/passdb.h + passdb/machine_sid.h + passdb/lookup_sid.h''', abi_match=private_pdb_match, abi_directory='passdb/ABI', - vnum='0', - vars=locals()) + vnum='0') bld.SAMBA3_LIBRARY('smbldaphelper', source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c', -- cgit