diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-12-17 19:21:47 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-12-17 19:21:47 +0100 |
| commit | 48f91ebc5aa3147b6b0784f676459dbe7e274a2b (patch) | |
| tree | 8dcc35b6ebaa8ccec7267816ad33b6923f8289e2 | |
| parent | 13b4e6e8c7616e37e4b1d37b49b82921c8c6059d (diff) | |
| download | samba-48f91ebc5aa3147b6b0784f676459dbe7e274a2b.tar.gz samba-48f91ebc5aa3147b6b0784f676459dbe7e274a2b.tar.bz2 samba-48f91ebc5aa3147b6b0784f676459dbe7e274a2b.zip | |
wafsamba: Don't build vscript for modules.
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 33ed018d4a..d92c90fb0e 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -202,8 +202,8 @@ def SAMBA_LIBRARY(bld, libname, source, if abi_directory: features += ' abi_check' + vscript = None if bld.env.HAVE_LD_VERSION_SCRIPT: - vscript = "%s.vscript" % libname if private_library: version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION) elif vnum: @@ -211,6 +211,7 @@ def SAMBA_LIBRARY(bld, libname, source, else: version = None if version: + vscript = "%s.vscript" % libname bld.ABI_VSCRIPT(libname, abi_directory, version, vscript) fullname = bld.env.shlib_PATTERN % bundled_name bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript)) @@ -218,8 +219,6 @@ def SAMBA_LIBRARY(bld, libname, source, # also make the .inst file depend on the vscript instname = bld.env.shlib_PATTERN % (bundled_name + '.inst') bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript)) - else: - vscript = None bld.SET_BUILD_GROUP(group) t = bld( |