summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba/samba_bundled.py
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-20 18:17:13 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-21 19:03:23 +1100
commitcd7190b802b4c4c645a7973156833b2a17db1965 (patch)
tree1813f742f1a22d509c52b80714b1230403a760c8 /buildtools/wafsamba/samba_bundled.py
parentc0878cfb615d35fc3a62e45fa9ecab7f178ecb3c (diff)
downloadsamba-cd7190b802b4c4c645a7973156833b2a17db1965.tar.gz
samba-cd7190b802b4c4c645a7973156833b2a17db1965.tar.bz2
samba-cd7190b802b4c4c645a7973156833b2a17db1965.zip
waf: allows libraries to be marked as private_library=True
this is for libraries where we make no promises about the API, but where we wish it to be a library to allow our binaries to use common code. These libraries always get the project suffix added to the library name, to ensure we are in a separate namespace Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools/wafsamba/samba_bundled.py')
-rw-r--r--buildtools/wafsamba/samba_bundled.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 822e49ce49..e5310dae3d 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -4,11 +4,11 @@ from Configure import conf
import Logs
from samba_utils import *
-def BUNDLED_NAME(bld, name, bundled_extension):
+def BUNDLED_NAME(bld, name, bundled_extension, private_library):
'''possibly rename a library to include a bundled extension'''
if bld.env.DISABLE_SHARED or not bundled_extension:
return name
- if name in bld.env.BUNDLED_EXTENSION_EXCEPTION:
+ if name in bld.env.BUNDLED_EXTENSION_EXCEPTION and not private_library:
return name
extension = getattr(bld.env, 'BUNDLED_EXTENSION', '')
if extension: