svn commit: samba r11254 - in branches/SAMBA_4_0/source/build/smb_build: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-10-21 21:53:49 +0000 (Fri, 21 Oct 2005)
New Revision: 11254

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11254

Log:
Remove support for [TARGET:foo]-like .mk-file entries
(it is already possible to include verbatim make data)

Modified:
   branches/SAMBA_4_0/source/build/smb_build/input.pm
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm	2005-10-21 21:46:49 UTC (rev 11253)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm	2005-10-21 21:53:49 UTC (rev 11254)
@@ -106,17 +106,6 @@
 	$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 @@
 		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;

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-10-21 21:46:49 UTC (rev 11253)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-10-21 21:53:49 UTC (rev 11254)
@@ -563,18 +563,6 @@
 	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 @@
 		($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);