diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-21 11:22:36 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-21 19:03:24 +1100 |
| commit | 7cba3cfac8781061e4114573517b30baedbf891a (patch) | |
| tree | 35470bb962d34fe5380f02f7124cf603fb097466 /source4 | |
| parent | 1d8733537e47439f8d79cd78d278eace1b795df3 (diff) | |
| download | samba-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
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal_build/wscript_build | 6 | ||||
| -rw-r--r-- | source4/lib/ldb/wscript | 2 |
2 files changed, 4 insertions, 4 deletions
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', |