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

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-20 13:54:19 +0000 (Mon, 20 Mar 2006)
New Revision: 14582

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

Log:
No longer require 'make proto' when running without automatic dependencies.
Don't create dependency files when running 'make clean'

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-03-20 13:26:16 UTC (rev 14581)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-03-20 13:54:19 UTC (rev 14582)
@@ -18,6 +18,7 @@
 	
 	bless($self, $myname);
 
+	$self->{automatic_deps} = 0;
 	$self->{manpages} = [];
 	$self->{sbin_progs} = [];
 	$self->{bin_progs} = [];
@@ -41,6 +42,10 @@
 	$self->output("################################################\n");
 	$self->output("\n");
 
+	if (!$self->{automatic_deps}) {
+		$self->output("ALL_PREDEP = proto\n");
+	}
+
 	$self->output("default: all\n\n");
 
 	$self->_prepare_path_vars();
@@ -509,11 +514,19 @@
 
 	$self->output($self->{mkfile});
 
-#	if ($self->{developer}) {
-#		$self->output("-include \$(DEP_FILES)\n");
-#	} else {
+	if ($self->{automatic_deps}) {
+		$self->output("
+ifneq (\$(MAKECMDGOALS),clean)
+ifneq (\$(MAKECMDGOALS),distclean)
+ifneq (\$(MAKECMDGOALS),realdistclean)
+-include \$(DEP_FILES)
+endif
+endif
+endif
+");
+	} else {
 		$self->output("include static_deps.mk\n");
-#	}
+	}
 
 	open(MAKEFILE,">$file") || die ("Can't open $file\n");
 	print MAKEFILE $self->{output};

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-03-20 13:26:16 UTC (rev 14581)
+++ branches/SAMBA_4_0/source/main.mk	2006-03-20 13:54:19 UTC (rev 14582)
@@ -1,4 +1,4 @@
-all: bin/asn1_compile bin/compile_et binaries libraries modules
+all: $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries libraries modules
 
 include dynconfig.mk
 include heimdal_build/config.mk