summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-27 14:25:06 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-30 23:48:59 +1100
commit0d45d97540df3b826c62bdd8e1ab29cde1f7f758 (patch)
treee453495a50aacdcc72dc4f6ea4bc1d6851fd7260 /source4
parent56b46d8d886cf7c42d52234fe5e6e67ee92e4906 (diff)
downloadsamba-0d45d97540df3b826c62bdd8e1ab29cde1f7f758.tar.gz
samba-0d45d97540df3b826c62bdd8e1ab29cde1f7f758.tar.bz2
samba-0d45d97540df3b826c62bdd8e1ab29cde1f7f758.zip
s4-ldb: create a private library ldb-cmdline
this prevents duplicate linking of the cmdline support code
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/wscript11
-rw-r--r--source4/utils/wscript_build2
2 files changed, 7 insertions, 6 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 6b5f0c3e1b..55eb6a871d 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -219,17 +219,18 @@ def build(bld):
else:
extra_cmdline_deps = ''
- bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE',
- 'tools/ldbutil.c tools/cmdline.c',
- 'ldb dl popt' + extra_cmdline_deps)
+ bld.SAMBA_LIBRARY('ldb-cmdline',
+ source='tools/ldbutil.c tools/cmdline.c',
+ deps='ldb dl popt' + extra_cmdline_deps,
+ private_library=True)
LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
for t in LDB_TOOLS.split():
- bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='LIBLDB_CMDLINE',
+ bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline',
manpages='man/%s.1' % t)
# ldbtest doesn't get installed
- bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='LIBLDB_CMDLINE',
+ bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='ldb-cmdline',
install=False)
diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index f7a6a5f48e..5658eff172 100644
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -11,6 +11,6 @@ bld.SAMBA_BINARY('ntlm_auth',
bld.SAMBA_BINARY('oLschema2ldif',
source='oLschema2ldif.c',
manpages='man/oLschema2ldif.1',
- deps='LIBLDB_CMDLINE SAMDB'
+ deps='ldb-cmdline SAMDB'
)