diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-27 14:25:06 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-30 23:48:59 +1100 |
| commit | 0d45d97540df3b826c62bdd8e1ab29cde1f7f758 (patch) | |
| tree | e453495a50aacdcc72dc4f6ea4bc1d6851fd7260 | |
| parent | 56b46d8d886cf7c42d52234fe5e6e67ee92e4906 (diff) | |
| download | samba-0d45d97540df3b826c62bdd8e1ab29cde1f7f758.tar.gz | |
s4-ldb: create a private library ldb-cmdline
this prevents duplicate linking of the cmdline support code
| -rw-r--r-- | source4/lib/ldb/wscript | 11 | ||||
| -rw-r--r-- | source4/utils/wscript_build | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 6b5f0c3e1bb..55eb6a871d7 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 f7a6a5f48e1..5658eff1723 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' ) |