From 2bff55f5deede15d09d2f685f5391e579ad36831 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 11 Oct 2010 01:03:42 +0200 Subject: dsdb/modules: Split up helpers a bit to prevent recursive dependencies. Autobuild-User: Jelmer Vernooij Autobuild-Date: Sun Oct 10 23:47:54 UTC 2010 on sn-devel-104 --- source4/dsdb/samdb/ldb_modules/wscript_build | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'source4/dsdb/samdb/ldb_modules/wscript_build') diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 399105332a..03b138b2ac 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS', source='util.c acl_util.c', autoproto='util_proto.h', - deps='ldb LIBNDR SAMDB_SCHEMA' + deps='ldb LIBNDR SAMDB_COMMON' ) bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC', @@ -12,6 +12,12 @@ bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC', deps='MESSAGING', ) +bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_SCHEMA', + source='schema.c', + autoproto='schema.h', + deps='SAMDB_SCHEMA' + ) + bld.SAMBA_MODULE('ldb_samba_dsdb', source='samba_dsdb.c', subsystem='ldb', @@ -135,7 +141,7 @@ bld.SAMBA_MODULE('ldb_rootdse', subsystem='ldb', init_function='LDB_MODULE(rootdse)', internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'), - deps='talloc LIBEVENTS SAMDB' + deps='talloc LIBEVENTS SAMDB MESSAGING' ) @@ -226,7 +232,7 @@ bld.SAMBA_MODULE('ldb_objectclass', subsystem='ldb', init_function='LDB_MODULE(objectclass)', internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'), - deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL' + deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL DSDB_MODULE_HELPER_SCHEMA' ) @@ -307,7 +313,7 @@ bld.SAMBA_MODULE('ldb_descriptor', subsystem='ldb', init_function='LDB_MODULE(descriptor)', internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'), - deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS' + deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' ) @@ -325,7 +331,7 @@ bld.SAMBA_MODULE('ldb_acl', subsystem='ldb', init_function='LDB_MODULE(acl)', internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'), - deps='talloc LIBEVENTS LIBSECURITY SAMDB DSDB_MODULE_HELPERS' + deps='talloc LIBEVENTS LIBSECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' ) -- cgit