summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-21 11:22:36 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-21 19:03:24 +1100
commit7cba3cfac8781061e4114573517b30baedbf891a (patch)
tree35470bb962d34fe5380f02f7124cf603fb097466
parent1d8733537e47439f8d79cd78d278eace1b795df3 (diff)
downloadsamba-7cba3cfac8781061e4114573517b30baedbf891a.tar.gz
samba-7cba3cfac8781061e4114573517b30baedbf891a.tar.bz2
samba-7cba3cfac8781061e4114573517b30baedbf891a.zip
waf: replace the is_bundled option with private_library
'private_library' better captures what we are trying to get at when we bundle a library
-rw-r--r--buildtools/wafsamba/samba_install.py2
-rw-r--r--buildtools/wafsamba/wafsamba.py12
-rw-r--r--lib/talloc/wscript4
-rw-r--r--lib/tdb/wscript2
-rw-r--r--lib/tevent/wscript2
-rw-r--r--source4/heimdal_build/wscript_build6
-rw-r--r--source4/lib/ldb/wscript2
7 files changed, 13 insertions, 17 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:
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 9550ea4cc6..bdf21a347b 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -61,7 +61,7 @@ def build(bld):
abi_match='talloc* _talloc*',
hide_symbols=True,
vnum=VERSION,
- is_bundled=not bld.env.standalone_talloc,
+ private_library=not bld.env.standalone_talloc,
manpages='talloc.3')
# should we also install the symlink to libtalloc1.so here?
@@ -70,7 +70,7 @@ def build(bld):
deps='talloc',
enabled = bld.env.TALLOC_COMPAT1,
vnum=VERSION,
- is_bundled=not bld.env.standalone_talloc)
+ private_library=not bld.env.standalone_talloc)
if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
# s4 already has the talloc testsuite builtin to smbtorture
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 340aebd591..5c2ecafd72 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -71,7 +71,7 @@ def build(bld):
abi_match='tdb_*',
hide_symbols=True,
vnum=VERSION,
- is_bundled=not bld.env.standalone_tdb)
+ private_library=not bld.env.standalone_tdb)
bld.SAMBA_BINARY('tdbtorture',
'tools/tdbtorture.c',
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 677ab8c75a..43d23e54c4 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -74,7 +74,7 @@ def build(bld):
abi_file='ABI/tevent-%s.sigs' % VERSION,
abi_match='tevent_* _tevent_*',
vnum=VERSION,
- is_bundled=not bld.env.standalone_tevent)
+ private_library=not bld.env.standalone_tevent)
if bld.env.standalone_tevent:
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index cc5dcdc9d1..ae5e092484 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -182,7 +182,7 @@ def HEIMDAL_AUTOPROTO_PRIVATE(header, source):
def HEIMDAL_LIBRARY(libname, source, deps, vnum,
includes='',
cflags='',
- is_bundled=True):
+ private_library=True):
'''define a Heimdal library'''
obj_target = libname + '.objlist'
@@ -204,7 +204,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
deps = to_list(deps)
deps.append(obj_target)
- if not is_bundled:
+ if not private_library:
# Sanitize the library name
bundled_name = libname.lower().replace('_', '-')
while bundled_name.startswith("lib"):
@@ -225,7 +225,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
vnum = vnum,
install_path = None,
name = libname,
- is_bundled = is_bundled,
+ private_library = private_library
)
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 7075380871..e79bad3d3d 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -130,7 +130,7 @@ def build(bld):
vnum=VERSION, manpages='man/ldb.3',
abi_file = abi_file,
abi_match = abi_match,
- is_bundled=not bld.env.standalone_ldb)
+ private_library=not bld.env.standalone_ldb)
bld.SAMBA_PYTHON('pyldb', 'pyldb.c',
deps='ldb pyldb_util',