diff options
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_install.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index eaeaff3af7..56e979ed53 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -95,7 +95,7 @@ def install_library(self): install_name = bld.make_libname(self.target, version=self.vnum) install_link = bld.make_libname(self.target, version=vnum_base) inst_name = bld.make_libname(t.target) - if not self.is_bundled: + if not self.private_library: # only generate the dev link for non-bundled libs dev_link = bld.make_libname(self.target) else: diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index bc8fd75b0c..4cb0402718 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -114,9 +114,9 @@ def SAMBA_LIBRARY(bld, libname, source, abi_file=None, abi_match=None, hide_symbols=False, - is_bundled=False, manpages=None, private_library=False, + grouping_library=False, enabled=True): '''define a Samba library''' @@ -168,16 +168,11 @@ def SAMBA_LIBRARY(bld, libname, source, realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON')) link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON')) - if private_library: - # private libraries always get the 'bundling' treatment with respect - # to the library name suffix - is_bundled = True - # we don't want any public libraries without version numbers if not private_library and vnum is None and target_type != 'PYTHON' and not realname: raise Utils.WafError("public library '%s' must have a vnum" % libname) - if target_type == 'PYTHON' or realname or not is_bundled: + if target_type == 'PYTHON' or realname or not private_library: # Sanitize the library name bundled_name = libname.lower().replace('_', '-') while bundled_name.startswith("lib"): @@ -214,7 +209,8 @@ def SAMBA_LIBRARY(bld, libname, source, samba_install = install, abi_file = abi_file, abi_match = abi_match, - is_bundled = is_bundled + private_library = private_library, + grouping_library=grouping_library ) if realname and not link_name: |