r6874: Fix static library build
authorJelmer Vernooij <jelmer@samba.org>
Wed, 18 May 2005 01:11:33 +0000 (01:11 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:16:53 +0000 (13:16 -0500)
source/build/smb_build/makefile.pm

index 6ca7f5ce8b6146a6f3a421faf5e3538f69ed2590..1d5b03b1248716bbd8cf84b90c3d0e85ff72abba 100644 (file)
@@ -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}
 ###################################