mirror of
https://github.com/samba-team/samba.git
synced 2025-09-16 01:44:21 +03:00
r11254: Remove support for [TARGET:foo]-like .mk-file entries
(it is already possible to include verbatim make data)
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
c53b32e093
commit
21e355d031
@@ -106,17 +106,6 @@ sub check_library($$)
|
|||||||
$lib->{OUTPUT_TYPE} = "SHARED_LIBRARY";
|
$lib->{OUTPUT_TYPE} = "SHARED_LIBRARY";
|
||||||
}
|
}
|
||||||
|
|
||||||
sub check_target($$)
|
|
||||||
{
|
|
||||||
my ($INPUT, $bin) = @_;
|
|
||||||
|
|
||||||
if (!defined($bin->{CMD})) {
|
|
||||||
print "CMD not defined for target!\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
$bin->{OUTPUT_TYPE} = "CUSTOM";
|
|
||||||
}
|
|
||||||
|
|
||||||
sub check_binary($$)
|
sub check_binary($$)
|
||||||
{
|
{
|
||||||
my ($INPUT, $bin) = @_;
|
my ($INPUT, $bin) = @_;
|
||||||
@@ -179,7 +168,6 @@ sub check($$)
|
|||||||
check_module($INPUT, $part) if ($part->{TYPE} eq "MODULE");
|
check_module($INPUT, $part) if ($part->{TYPE} eq "MODULE");
|
||||||
check_library($INPUT, $part) if ($part->{TYPE} eq "LIBRARY");
|
check_library($INPUT, $part) if ($part->{TYPE} eq "LIBRARY");
|
||||||
check_binary($INPUT, $part) if ($part->{TYPE} eq "BINARY");
|
check_binary($INPUT, $part) if ($part->{TYPE} eq "BINARY");
|
||||||
check_target($INPUT, $part) if ($part->{TYPE} eq "TARGET");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
my %depend = %$INPUT;
|
my %depend = %$INPUT;
|
||||||
|
@@ -563,18 +563,6 @@ __EOD__
|
|||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub _prepare_custom_rule($)
|
|
||||||
{
|
|
||||||
my $ctx = shift;
|
|
||||||
return "
|
|
||||||
$ctx->{NAME}: bin/.TARGET_$ctx->{NAME}
|
|
||||||
|
|
||||||
bin/.TARGET_$ctx->{NAME}:
|
|
||||||
$ctx->{CMD}
|
|
||||||
touch bin/.TARGET_$ctx->{NAME}
|
|
||||||
";
|
|
||||||
}
|
|
||||||
|
|
||||||
sub _prepare_clean_rules($)
|
sub _prepare_clean_rules($)
|
||||||
{
|
{
|
||||||
my ($self) = @_;
|
my ($self) = @_;
|
||||||
@@ -663,7 +651,6 @@ sub _prepare_rule_lists($$)
|
|||||||
($output .= _prepare_static_library_rule($key)) if $key->{OUTPUT_TYPE} eq "STATIC_LIBRARY";
|
($output .= _prepare_static_library_rule($key)) if $key->{OUTPUT_TYPE} eq "STATIC_LIBRARY";
|
||||||
($output .= _prepare_shared_library_rule($key)) if $key->{OUTPUT_TYPE} eq "SHARED_LIBRARY";
|
($output .= _prepare_shared_library_rule($key)) if $key->{OUTPUT_TYPE} eq "SHARED_LIBRARY";
|
||||||
($output .= _prepare_binary_rule($key)) if $key->{OUTPUT_TYPE} eq "BINARY";
|
($output .= _prepare_binary_rule($key)) if $key->{OUTPUT_TYPE} eq "BINARY";
|
||||||
($output .= _prepare_custom_rule($key) ) if $key->{TYPE} eq "TARGET";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$output .= _prepare_clean_rules($self);
|
$output .= _prepare_clean_rules($self);
|
||||||
|
Reference in New Issue
Block a user