From 306754f2949f72f2629a954e2c8bfd6182307370 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 30 Oct 2010 11:42:51 +1100
Subject: s4-ldb: add explicit depenencies on ldb library in ldb modules

ldb modules call module functions from the main ldb library

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
---
 source4/lib/ldb/wscript | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'source4/lib')

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 55eb6a871d..04aa4e8f9a 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -158,43 +158,51 @@ def build(bld):
         bld.SAMBA_MODULE('ldb_paged_results',
                          'modules/paged_results.c',
                          init_function='LDB_MODULE(paged_results)',
+                         deps='ldb',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_asq',
                          'modules/asq.c',
                          init_function='LDB_MODULE(asq)',
+                         deps='ldb',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_server_sort',
                          'modules/sort.c',
                          init_function='LDB_MODULE(server_sort)',
+                         deps='ldb',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_paged_searches',
                          'modules/paged_searches.c',
                          init_function='LDB_MODULE(paged_searches)',
                          enabled = s4_build,
+                         deps='ldb',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_rdn_name',
                          'modules/rdn_name.c',
                          init_function='LDB_MODULE(rdn_name)',
+                         deps='ldb',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_sample',
                          'tests/sample_module.c',
                          init_function='LDB_MODULE(sample)',
+                         deps='ldb',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_skel',
                          'modules/skel.c',
                          init_function='LDB_MODULE(skel)',
+                         deps='ldb',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_sqlite3',
                          'sqlite3/ldb_sqlite3.c',
                          init_function='LDB_BACKEND(sqlite3)',
                          enabled=False,
+                         deps='ldb',
                          subsystem='ldb')
 
         bld.SAMBA_MODULE('ldb_tdb',
@@ -202,7 +210,7 @@ def build(bld):
                                     '''ldb_tdb.c ldb_pack.c ldb_search.c ldb_index.c
                                     ldb_cache.c ldb_tdb_wrap.c'''),
                          init_function='LDB_BACKEND(tdb)',
-                         deps='tdb',
+                         deps='tdb ldb',
                          subsystem='ldb')
 
         # have a separate subsystem for common/ldb.c, so it can rebuild
@@ -226,7 +234,7 @@ def build(bld):
 
     LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
     for t in LDB_TOOLS.split():
-        bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline',
+        bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline ldb',
                          manpages='man/%s.1' % t)
 
     # ldbtest doesn't get installed
-- 
cgit