summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/input.pm
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-02-15 13:30:55 +1100
committerAndrew Tridgell <tridge@samba.org>2008-02-15 13:30:55 +1100
commit5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c (patch)
tree3568dad2be35a6fa96bd065820cec452fed2b61e /source4/build/smb_build/input.pm
parent60b314428008878f949b9fba54825c2f4f900288 (diff)
parentf3bbe1516c95ac29b3ff51a2b5a91105d315524b (diff)
downloadsamba-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/input.pm')
-rw-r--r--source4/build/smb_build/input.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 6d5c4f4a1e..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}_FULL_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);