sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Move more code out of perl.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-02-26 02:45:12 +01:00
parent ef00f6b581
commit ad258e8635
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/build/smb_build/makefile.pm
View File

@ -228,7 +228,7 @@ sub MergedObj($$)
return unless defined($ctx->{OUTPUT});
$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->output("\$(call partial_link_template, $ctx->{RESULT_MERGED_OBJ}, \$($ctx->{NAME}_OBJ_LIST))\n");
$self->output("\$(call partial_link_template, \$($ctx->{NAME}_OUTPUT), \$($ctx->{NAME}_OBJ_LIST))\n");
}
sub StaticLibraryPrimitives($$)

8
source/build/smb_build/output.pm
View File

@ -164,8 +164,8 @@ sub create_output($$)
my $elem = $depend->{$_};
next if $elem == $part;
merge_array(\$part->{FINAL_CFLAGS}, $elem->{CPPFLAGS});
merge_array(\$part->{FINAL_CFLAGS}, $elem->{CFLAGS});
push(@{$part->{FINAL_CFLAGS}}, "\$($elem->{NAME}_CPPFLAGS)");
push(@{$part->{FINAL_CFLAGS}}, "\$($elem->{NAME}_CFLAGS)");
}
# Always import the link options of the unique dependencies
@ -173,8 +173,8 @@ sub create_output($$)
my $elem = $depend->{$_};
next if $elem == $part;
push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
push(@{$part->{LINK_FLAGS}}, @{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_LIBS)");
push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_LDFLAGS");
if (defined($elem->{OUTPUT_TYPE}) and @{$elem->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ") {
push (@{$part->{FULL_OBJ_LIST}}, $elem->{TARGET});
} else {