summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-25 21:00:44 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-26 14:36:54 +1000
commita241daae2d2c2acf150993dc90e234a851539963 (patch)
treecac931649f413326f0d701c908d8632a78f37183
parentc8824fd9b4cfd5a5925671ce41063764f27d50e8 (diff)
downloadsamba-a241daae2d2c2acf150993dc90e234a851539963.tar.gz
samba-a241daae2d2c2acf150993dc90e234a851539963.tar.bz2
samba-a241daae2d2c2acf150993dc90e234a851539963.zip
build: a library is only empty if it has no deps
-rw-r--r--buildtools/wafsamba/wafsamba.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 56ecfb1df3..36f8777226 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -123,7 +123,7 @@ def SAMBA_LIBRARY(bld, libname, source,
source = bld.EXPAND_VARIABLES(source, vars=vars)
# remember empty libraries, so we can strip the dependencies
- if (source == '') or (source == []):
+ if ((source == '') or (source == [])) and deps == '' and public_deps == '':
SET_TARGET_TYPE(bld, libname, 'EMPTY')
return
@@ -329,7 +329,7 @@ def SAMBA_MODULE(bld, modname, source,
source = unique_list(TO_LIST(source))
# remember empty modules, so we can strip the dependencies
- if (source == '') or (source == []):
+ if ((source == '') or (source == [])) and deps == '' and public_deps == '':
SET_TARGET_TYPE(bld, modname, 'EMPTY')
return
@@ -389,7 +389,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
return
# remember empty subsystems, so we can strip the dependencies
- if (source == '') or (source == []):
+ if ((source == '') or (source == [])) and deps == '' and public_deps == '':
SET_TARGET_TYPE(bld, modname, 'EMPTY')
return