From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 18 May 2005 01:11:33 +0000 (+0000)
Subject: r6874: Fix static library build
X-Git-Tag: samba-misc-tags/initial-v4-0-unstable~9227
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=1437257616a67634f2211ce85b70fc9d71acd17e

r6874: Fix static library build
---

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 6ca7f5ce8b6..1d5b03b1248 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/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}
 ###################################