From da63ed00157f392547aaeee7fd946bffc352225c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 21 Oct 2005 21:53:49 +0000
Subject: r11254: Remove support for [TARGET:foo]-like .mk-file entries (it is
 already possible to include verbatim make data) (This used to be commit
 21e355d031c6233ed0f40207d716987931927c6c)

---
 source4/build/smb_build/input.pm    | 12 ------------
 source4/build/smb_build/makefile.pm | 13 -------------
 2 files changed, 25 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index a68d9946da..9b3c0afc60 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -106,17 +106,6 @@ sub check_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($$)
 {
 	my ($INPUT, $bin) = @_;
@@ -179,7 +168,6 @@ sub check($$)
 		check_module($INPUT, $part) if ($part->{TYPE} eq "MODULE");
 		check_library($INPUT, $part) if ($part->{TYPE} eq "LIBRARY");
 		check_binary($INPUT, $part) if ($part->{TYPE} eq "BINARY");
-		check_target($INPUT, $part) if ($part->{TYPE} eq "TARGET");
 	}
 
 	my %depend = %$INPUT;
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 1b8fcb7c6b..7827c4124f 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -563,18 +563,6 @@ __EOD__
 	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($)
 {
 	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_shared_library_rule($key)) if $key->{OUTPUT_TYPE} eq "SHARED_LIBRARY";
 		($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);
-- 
cgit