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/input.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/input.pm')
-rw-r--r-- | source4/build/smb_build/input.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 594daf6290..51c89a834f 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -208,8 +208,8 @@ sub import_integrated($$) next if($mod->{SUBSYSTEM} ne $lib->{NAME}); next if($mod->{ENABLE} ne "YES"); - push (@{$lib->{FULL_OBJ_LIST}}, "\$($mod->{TYPE}_$mod->{NAME}_OBJ_LIST)"); - push (@{$lib->{LINK_FLAGS}}, "\$($mod->{TYPE}_$mod->{NAME}_LINK_FLAGS)"); + push (@{$lib->{FULL_OBJ_LIST}}, "\$($mod->{NAME}_OBJ_LIST)"); + push (@{$lib->{LINK_FLAGS}}, "\$($mod->{NAME}_LINK_FLAGS)"); push (@{$lib->{CFLAGS}}, @{$mod->{CFLAGS}}) if defined($mod->{CFLAGS}); push (@{$lib->{PUBLIC_DEPENDENCIES}}, @{$mod->{PUBLIC_DEPENDENCIES}}) if defined($mod->{PUBLIC_DEPENDENCIES}); push (@{$lib->{PRIVATE_DEPENDENCIES}}, @{$mod->{PRIVATE_DEPENDENCIES}}) if defined($mod->{PRIVATE_DEPENDENCIES}); @@ -284,7 +284,7 @@ sub check($$$$$) my $part = $INPUT->{$k}; $part->{LINK_FLAGS} = []; - $part->{FULL_OBJ_LIST} = ["\$($part->{TYPE}_$part->{NAME}_OBJ_LIST)"]; + $part->{FULL_OBJ_LIST} = ["\$($part->{NAME}_OBJ_LIST)"]; if ($part->{TYPE} eq "SUBSYSTEM") { check_subsystem($INPUT, $part, $subsys_ot); |