diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-24 11:50:47 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-26 10:17:18 -0700 |
| commit | 50256c01d061c6d73bb2d8ee2c60785d58748e6c (patch) | |
| tree | 3a450c294f273aca16126a990f9c86a5643caa2a /lib/talloc/wscript | |
| parent | a74e8be6d1448f121181e6d7cca3841891321a12 (diff) | |
| download | samba-50256c01d061c6d73bb2d8ee2c60785d58748e6c.tar.gz samba-50256c01d061c6d73bb2d8ee2c60785d58748e6c.tar.xz samba-50256c01d061c6d73bb2d8ee2c60785d58748e6c.zip | |
waf: Only specify vnum for non-private libraries.
Diffstat (limited to 'lib/talloc/wscript')
| -rw-r--r-- | lib/talloc/wscript | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 56de6eabc78..3cf5ade2c8f 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -52,6 +52,24 @@ def configure(conf): def build(bld): bld.RECURSE('lib/replace') + if bld.env.standalone_talloc: + bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + bld.env.TALLOC_VERSION = VERSION + bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION) + bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h') + private_library = False + vnum = VERSION + + # should we also install the symlink to libtalloc1.so here? + bld.SAMBA_LIBRARY('talloc-compat1', + 'compat/talloc_compat1.c', + deps='talloc', + enabled = bld.env.TALLOC_COMPAT1, + vnum=VERSION) + else: + private_library = True + vnum = None + if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'): bld.SAMBA_LIBRARY('talloc', @@ -60,18 +78,10 @@ def build(bld): abi_file='ABI/talloc-%s.sigs' % VERSION, abi_match='talloc* _talloc*', hide_symbols=True, - vnum=VERSION, - private_library=not bld.env.standalone_talloc, + vnum=vnum, + private_library=private_library, manpages='talloc.3') - # should we also install the symlink to libtalloc1.so here? - bld.SAMBA_LIBRARY('talloc-compat1', - 'compat/talloc_compat1.c', - deps='talloc', - enabled = bld.env.TALLOC_COMPAT1, - vnum=VERSION, - 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 bld.SAMBA_BINARY('talloc_testsuite', @@ -79,11 +89,6 @@ def build(bld): deps='talloc', install=False) - if bld.env.standalone_talloc: - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - bld.env.TALLOC_VERSION = VERSION - bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION) - bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h') def test(ctx): '''run talloc testsuite''' |