From a241daae2d2c2acf150993dc90e234a851539963 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 25 Apr 2010 21:00:44 +1000 Subject: build: a library is only empty if it has no deps --- buildtools/wafsamba/wafsamba.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'buildtools/wafsamba/wafsamba.py') 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 -- cgit