From e801e013c83747fcf85cd6abd1b1834bd08340e2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 18 Mar 2006 23:31:40 +0000
Subject: r14552: Remove old dependency code (This used to be commit
 44e132cf1a48174f538348b743096251b3e8f92f)

---
 source4/build/smb_build/main.pl     |  2 --
 source4/build/smb_build/makefile.pm | 18 +++---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 3443dbc46b..907f513c5c 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -74,8 +74,6 @@ foreach my $key (values %$OUTPUT) {
 	$mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
 	$mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or 
 								 defined($key->{PUBLIC_PROTO_HEADER});
-
-#	$mkenv->DependencyInfo($key) if $config::config{developer} eq "yes";
 }
 
 $mkenv->write("Makefile");
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index e632895f20..aeffc79e4d 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -187,18 +187,6 @@ sub _prepare_list($$$)
 	$self->output("$ctx->{TYPE}\_$ctx->{NAME}_$var =$tmplist\n");
 }
 
-sub DependencyInfo($$)
-{
-	my ($self,$ctx) = @_;
-
-	$self->output("bin/deps/$ctx->{TYPE}_$ctx->{NAME}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)");
-	$self->output("\n");
-	$self->output("\t\@echo \"Generating dependency info for $ctx->{NAME}\"\n");
-	$self->output("\t\@./script/cdeps.pl \$^ > \$@\n");
-	$self->output("\n");
-	$self->output("-include bin/deps/$ctx->{TYPE}_$ctx->{NAME}\n\n");
-}
-
 sub SharedLibrary($$)
 {
 	my ($self,$ctx) = @_;
@@ -518,17 +506,17 @@ sub write($$)
 
 	$self->_prepare_mk_files();
 
+	$self->output($self->{mkfile});
+
 	if ($self->{developer}) {
 		$self->output(<<__EOD__
 
-#-include \$(ALL_OBJS:.o=.d)
+-include \$(DEP_FILES)
 
 __EOD__
 );
 	}
 
-	$self->output($self->{mkfile});
-
 	open(MAKEFILE,">$file") || die ("Can't open $file\n");
 	print MAKEFILE $self->{output};
 	close(MAKEFILE);
-- 
cgit