summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-25 18:19:01 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-25 18:19:01 +0100
commitab88018a6e16c7b8d7f77913ad8c80e68ed6ccea (patch)
treea1630a906dd500d0f3865a7be7857603e1cf2ca8
parentaab0ef161ca647fb7daecc3dba349d3fe1be982c (diff)
downloadsamba-ab88018a6e16c7b8d7f77913ad8c80e68ed6ccea.tar.gz
samba-ab88018a6e16c7b8d7f77913ad8c80e68ed6ccea.tar.bz2
samba-ab88018a6e16c7b8d7f77913ad8c80e68ed6ccea.zip
Remove more unnecessary generated code.
(This used to be commit 7398bc1a9f0d3cf30db3187a3849dbea6b846bb2)
-rw-r--r--source4/build/smb_build/makefile.pm4
1 files changed, 1 insertions, 3 deletions
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");
}