diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-02-15 13:30:55 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-02-15 13:30:55 +1100 |
| commit | 5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c (patch) | |
| tree | 3568dad2be35a6fa96bd065820cec452fed2b61e /source4/build/smb_build/output.pm | |
| parent | 60b314428008878f949b9fba54825c2f4f900288 (diff) | |
| parent | f3bbe1516c95ac29b3ff51a2b5a91105d315524b (diff) | |
| download | samba-5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c.tar.gz samba-5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c.tar.bz2 samba-5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 9c12b5b49679d404ac623041f2da944019f97754)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 855d03ade2..4350370fbf 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -116,7 +116,7 @@ sub generate_binary($) my $bin = shift; $bin->{DEPEND_LIST} = []; - push(@{$bin->{LINK_FLAGS}}, "\$($bin->{TYPE}_$bin->{NAME}\_OBJ_LIST)"); + push(@{$bin->{LINK_FLAGS}}, "\$($bin->{NAME}\_OBJ_LIST)"); $bin->{DEBUGDIR} = "bin/"; $bin->{TARGET_BINARY} = $bin->{OUTPUT_BINARY} = "$bin->{DEBUGDIR}/$bin->{NAME}"; @@ -176,7 +176,7 @@ sub create_output($$) my $elem = $depend->{$_}; next if $elem == $part; - push(@{$part->{LINK_FLAGS}}, $elem->{OUTPUT}) if defined($elem->{OUTPUT}); + push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_OUTPUT)") if defined($elem->{OUTPUT}); push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS}); push(@{$part->{LINK_FLAGS}},@{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS}); push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET}); |