diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-14 12:03:34 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-14 12:03:34 +0100 |
| commit | e33177001cdd7d55e45bb9c6ed3f39bf33a9da84 (patch) | |
| tree | 0d516b2323355ef55de28e36b66d9c15e6814217 /source4/build/smb_build/output.pm | |
| parent | 02af3663a457ebc6aa30e79614e44fb16be8cadd (diff) | |
| download | samba-e33177001cdd7d55e45bb9c6ed3f39bf33a9da84.tar.gz samba-e33177001cdd7d55e45bb9c6ed3f39bf33a9da84.tar.bz2 samba-e33177001cdd7d55e45bb9c6ed3f39bf33a9da84.zip | |
Remove type before variables in data.mk
(This used to be commit 3c1a7c0dcc56ed5595e31a8df023a04ae95bfca5)
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 6f2d9dd209..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->{TYPE}_$elem->{NAME}_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}); |