From ab88018a6e16c7b8d7f77913ad8c80e68ed6ccea Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 25 Feb 2008 18:19:01 +0100
Subject: Remove more unnecessary generated code. (This used to be commit
 7398bc1a9f0d3cf30db3187a3849dbea6b846bb2)

---
 source4/build/smb_build/makefile.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source4')

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 34e1d4817f..bed98bb2c6 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -211,7 +211,7 @@ sub MergedObj($$)
 $ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_OBJ_LIST)
 	\@echo Partially linking \$@
 	\@mkdir -p \$(D@)
-	\$(PARTLINK) -o \$@ \$($ctx->{NAME}_OBJ_LIST)
+	\$(PARTLINK) -o \$@ \$^
 
 __EOD__
 );
@@ -223,8 +223,6 @@ sub StaticLibraryPrimitives($$)
 
 	return unless (defined($ctx->{OBJ_FILES}));
 
-	push (@{$self->{static_libs}}, $ctx->{RESULT_STATIC_LIBRARY}) if ($ctx->{TYPE} eq "LIBRARY");
-
 	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
 	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
 }
-- 
cgit