From 895a0a3238e1f17f39ab0e4543dbd6318d6f8f11 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 26 Feb 2008 02:45:12 +0100
Subject: Move more code out of perl. (This used to be commit
 ad258e86353250fd447d461c94649c1541b37844)

---
 source4/build/smb_build/makefile.pm | 2 +-
 source4/build/smb_build/output.pm   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index c2a0c2287e..13c28de697 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -228,7 +228,7 @@ sub MergedObj($$)
 	return unless defined($ctx->{OUTPUT});
 
 	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-	$self->output("\$(call partial_link_template, $ctx->{RESULT_MERGED_OBJ}, \$($ctx->{NAME}_OBJ_LIST))\n");
+	$self->output("\$(call partial_link_template, \$($ctx->{NAME}_OUTPUT), \$($ctx->{NAME}_OBJ_LIST))\n");
 }
 
 sub StaticLibraryPrimitives($$)
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index eec438b108..67794f9d54 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -164,8 +164,8 @@ sub create_output($$)
 			my $elem = $depend->{$_};
 			next if $elem == $part;
 
-			merge_array(\$part->{FINAL_CFLAGS}, $elem->{CPPFLAGS});
-			merge_array(\$part->{FINAL_CFLAGS}, $elem->{CFLAGS});
+			push(@{$part->{FINAL_CFLAGS}}, "\$($elem->{NAME}_CPPFLAGS)");
+			push(@{$part->{FINAL_CFLAGS}}, "\$($elem->{NAME}_CFLAGS)");
 		}
 
 		# Always import the link options of the unique dependencies
@@ -173,8 +173,8 @@ sub create_output($$)
 			my $elem = $depend->{$_};
 			next if $elem == $part;
 
-			push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
-			push(@{$part->{LINK_FLAGS}}, @{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
+			push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_LIBS)");
+			push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_LDFLAGS");
 			if (defined($elem->{OUTPUT_TYPE}) and @{$elem->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ") {
 				push (@{$part->{FULL_OBJ_LIST}}, $elem->{TARGET});
 			} else {
-- 
cgit