summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-05-18 01:11:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:53 -0500
commit9ed5afad6c97fe0ea7f71e77443a9fef733a3ae3 (patch)
treecf4f1106c7fabb9cade12adde272c8919e9ccbac /source4/build
parent6b7c27c33e5ed08b9411d88b4d0cd503e61225b1 (diff)
downloadsamba-9ed5afad6c97fe0ea7f71e77443a9fef733a3ae3.tar.gz
samba-9ed5afad6c97fe0ea7f71e77443a9fef733a3ae3.tar.bz2
samba-9ed5afad6c97fe0ea7f71e77443a9fef733a3ae3.zip
r6874: Fix static library build
(This used to be commit 1437257616a67634f2211ce85b70fc9d71acd17e)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/makefile.pm14
1 files changed, 6 insertions, 8 deletions
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}
###################################