summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-13 16:59:45 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-13 15:41:29 +0000
commit18ea6c5dce8be836cb92b5b884cf6abac4a0f857 (patch)
tree7060d2b8bbf3dd7f0ff230c52ebb97777e998d0a
parent36c1ed215d60ddb0fb41ffd471fc3aa6e53266de (diff)
downloadsamba-18ea6c5dce8be836cb92b5b884cf6abac4a0f857.tar.gz
samba-18ea6c5dce8be836cb92b5b884cf6abac4a0f857.tar.bz2
samba-18ea6c5dce8be836cb92b5b884cf6abac4a0f857.zip
ldb: Only build LIBLDB_MAIN when building ldb itself.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Wed Oct 13 15:41:29 UTC 2010 on sn-devel-104
-rw-r--r--source4/lib/ldb/wscript16
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index d10bebc4aa..14fb49a328 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -187,20 +187,20 @@ def build(bld):
deps='tdb',
subsystem='ldb')
+ # have a separate subsystem for common/ldb.c, so it can rebuild
+ # for install with a different -DLDB_MODULESDIR=
+ bld.SAMBA_SUBSYSTEM('LIBLDB_MAIN',
+ 'common/ldb.c',
+ deps='tevent',
+ includes='include',
+ cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir)
+
if s4_build:
extra_cmdline_deps = ' LDBSAMBA POPT_SAMBA POPT_CREDENTIALS ' \
'LIBCMDLINE_CREDENTIALS gensec'
else:
extra_cmdline_deps = ''
- # have a separate subsystem for common/ldb.c, so it can rebuild
- # for install with a different -DLDB_MODULESDIR=
- bld.SAMBA_SUBSYSTEM('LIBLDB_MAIN',
- 'common/ldb.c',
- deps='tevent',
- includes='include',
- cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir)
-
bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE',
'tools/ldbutil.c tools/cmdline.c',
'ldb dl popt' + extra_cmdline_deps)