summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-06-15 01:35:42 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-15 13:15:50 +0200
commitde68718d3ddb9a8e88267fae51e90d5db9b91fe7 (patch)
treeea2f89a4bca6b006ff90bf3e53a8a45be8a5448c
parent0d7f8fb73d95c4658e785cb2f8bba57baf85b487 (diff)
downloadsamba-de68718d3ddb9a8e88267fae51e90d5db9b91fe7.tar.gz
samba-de68718d3ddb9a8e88267fae51e90d5db9b91fe7.tar.bz2
samba-de68718d3ddb9a8e88267fae51e90d5db9b91fe7.zip
wafsamba: Fix filenames for ldb modules.
-rw-r--r--buildtools/wafsamba/wafsamba.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index faa5358f37..e1bc975073 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -357,21 +357,29 @@ def SAMBA_MODULE(bld, modname, source,
deps = TO_LIST(deps)
deps.append(obj_target)
+ realname = modname
if subsystem is not None:
deps.append(subsystem)
+ while realname.startswith("lib"+subsystem+"_"):
+ realname = realname[len("lib"+subsystem+"_"):]
+ while realname.startswith(subsystem+"_"):
+ realname = realname[len(subsystem+"_"):]
+ while realname.startswith("lib"):
+ realname = realname[len("lib"):]
bld.SET_BUILD_GROUP('main')
t = bld(
features = 'cc cshlib install_lib',
source = [],
- target = modname,
+ target = realname,
+ name = modname,
samba_cflags = CURRENT_CFLAGS(bld, modname, cflags),
samba_includes = includes,
local_include = local_include,
samba_deps = deps,
install_path = None,
samba_inst_path= "${MODULESDIR}/%s" % subsystem,
- samba_realname = None,
+ samba_realname = realname+ ".${SHLIBEXT}",
vnum = None,
samba_install = True,
is_bundled = False,