From 9ed5afad6c97fe0ea7f71e77443a9fef733a3ae3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 18 May 2005 01:11:33 +0000
Subject: r6874: Fix static library build (This used to be commit
 1437257616a67634f2211ce85b70fc9d71acd17e)

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

(limited to 'source4/build/smb_build')

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 6ca7f5ce8b..1d5b03b124 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -439,9 +439,7 @@ sub _prepare_static_library_rule($)
 	$tmpstlink = array2oneperline($ctx->{LINK_LIST});
 	$tmpstflag = array2oneperline($ctx->{LINK_FLAGS});
 
-	$tmprules = "bin/$ctx->{LIBRARY_NAME}";
-
-	$output = << '__EOD__';
+	$output = << "__EOD__";
 ###################################
 # Start Library $ctx->{NAME}
 #
@@ -450,12 +448,12 @@ LIBRARY_$ctx->{NAME}_DEPEND_LIST =$tmpdepend
 LIBRARY_$ctx->{NAME}_STATIC_LINK_LIST =$tmpstlink
 #
 # Static $ctx->{LIBRARY_NAME}
-$ctx->{TARGET}: $(LIBRARY_$ctx->{NAME}_DEPEND_LIST) bin/.dummy
-	@echo Linking $@
-	@$(STLD) $(STLD_FLAGS) $@ \\
-		$(LIBRARY_$ctx->{NAME}_STATIC_LINK_LIST)
+$ctx->{TARGET}: \$(LIBRARY_$ctx->{NAME}_DEPEND_LIST) bin/.dummy
+	\@echo Linking \$@
+	\@\$(STLD) \$(STLD_FLAGS) \$@ \\
+		\$(LIBRARY_$ctx->{NAME}_STATIC_LINK_LIST)
 
-library_$ctx->{NAME}: basics $tmprules
+library_$ctx->{NAME}: basics $ctx->{TARGET}
 # End Library $ctx->{NAME}
 ###################################
 
-- 
cgit