svn commit: samba r6874 - in branches/SAMBA_4_0/source/build/smb_build: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-05-18 01:11:33 +0000 (Wed, 18 May 2005)
New Revision: 6874

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6874

Log:
Fix static library build

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-05-18 01:03:55 UTC (rev 6873)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-05-18 01:11:33 UTC (rev 6874)
@@ -439,9 +439,7 @@
 	$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}_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}
 ###################################