git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3d289fe
)
buildtools: add the PRIVATE_EXTENSION for private libraries
author
Stefan Metzmacher
<metze@samba.org>
Wed, 8 Dec 2010 11:02:51 +0000
(12:02 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Wed, 8 Dec 2010 15:11:48 +0000
(16:11 +0100)
metze
buildtools/wafsamba/samba_bundled.py
patch
|
blob
|
history
diff --git
a/buildtools/wafsamba/samba_bundled.py
b/buildtools/wafsamba/samba_bundled.py
index 4f6590eb3b5b18f71acc564c51f9d19472023228..324721fe362220ceee55cd7bee5d891ec7c204ce 100644
(file)
--- a/
buildtools/wafsamba/samba_bundled.py
+++ b/
buildtools/wafsamba/samba_bundled.py
@@
-10,9
+10,6
@@
def PRIVATE_NAME(bld, name, private_extension, private_library):
return name
if name in bld.env.PRIVATE_EXTENSION_EXCEPTION and not private_library:
return name
- if private_library and bld.EXPAND_VARIABLES(bld.env.LIBDIR) != bld.EXPAND_VARIABLES(bld.env.PRIVATELIBDIR):
- # Private libraries already have their own namespace in another way
- return name
extension = getattr(bld.env, 'PRIVATE_EXTENSION', '')
if extension:
return name + '-' + extension