From a45445682047a60dd435f8a3e2176bb217b68c55 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Apr 2006 14:49:59 +0000
Subject: r14997: Fix build of static libraries. Libraries build fine now, but
 linking doesn't work yet. (This used to be commit
 d3106699dba7a4344511134dd2cf1bfa2f4bc7ab)

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

(limited to 'source4/build')

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index e511cbaca2..197cbc9551 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -133,7 +133,7 @@ LD=$self->{config}->{LD}
 LDFLAGS=$self->{config}->{LDFLAGS} -L\$(builddir)/bin
 
 STLD=$self->{config}->{AR}
-STLD_FLAGS=-rc -L\$(builddir)/bin
+STLD_FLAGS=-rc
 
 SHLD=$self->{config}->{CC}
 SHLD_FLAGS=$self->{config}->{LDSHFLAGS} -L\$(builddir)/bin
@@ -342,7 +342,7 @@ sub StaticLibrary($$)
 {
 	my ($self,$ctx) = @_;
 
-	push (@{$self->{static_libs}}, $ctx->{OUTPUT});
+	push (@{$self->{static_libs}}, $ctx->{TARGET});
 
 	$self->_prepare_list($ctx, "OBJ_LIST");
 	$self->_prepare_list($ctx, "CFLAGS");
@@ -355,10 +355,10 @@ sub StaticLibrary($$)
 		
 	$self->output(<< "__EOD__"
 #
-$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) 
+$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) 
 	\@echo Linking \$@
 	\@\$(STLD) \$(STLD_FLAGS) \$@ \\
-		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
+		\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)
 
 __EOD__
 );
-- 
cgit