From f6dec9de4715892abab6cc9f75c2eb6c70f75947 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 16 Feb 2008 20:48:08 +0100
Subject: Use standard variable for partial linking. (This used to be commit
 949fca9540889bb640466fc21ca36d08f77066a3)

---
 source4/build/smb_build/input.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/build/smb_build/input.pm')

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 51c89a834f..02eafe2033 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -234,6 +234,7 @@ sub calc_unique_deps($$$$$$$$)
  		if (defined ($dep->{OUTPUT_TYPE}) && 
 			($withlibs or 
 			(@{$dep->{OUTPUT_TYPE}}[0] eq "INTEGRATED") or 
+			(@{$dep->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ") or 
 			(@{$dep->{OUTPUT_TYPE}}[0] eq "STATIC_LIBRARY"))) {
 				push (@$busy, $dep->{NAME});
 			        calc_unique_deps($dep->{NAME}, $INPUT, $dep->{PUBLIC_DEPENDENCIES}, $udeps, $withlibs, $forward, $pubonly, $busy);
-- 
cgit