summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-20 13:54:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:53 -0500
commit9ef4e90539c6d262a5fbc36bdde2c8355be3aa56 (patch)
treee00a42b2aa724eb4b12863d1fd779b9a173db877
parentb40ab97585ff96dde9733a03e2f54ba58deac372 (diff)
downloadsamba-9ef4e90539c6d262a5fbc36bdde2c8355be3aa56.tar.gz
samba-9ef4e90539c6d262a5fbc36bdde2c8355be3aa56.tar.bz2
samba-9ef4e90539c6d262a5fbc36bdde2c8355be3aa56.zip
r14582: No longer require 'make proto' when running without automatic dependencies.
Don't create dependency files when running 'make clean' (This used to be commit 6414d0c04fce969d4400a013aeaa3fa75849e2de)
-rw-r--r--source4/build/smb_build/makefile.pm21
-rw-r--r--source4/main.mk2
2 files changed, 18 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 2429c99369..a7dc4ff3e5 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -18,6 +18,7 @@ sub new($$$)
bless($self, $myname);
+ $self->{automatic_deps} = 0;
$self->{manpages} = [];
$self->{sbin_progs} = [];
$self->{bin_progs} = [];
@@ -41,6 +42,10 @@ sub new($$$)
$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 @@ sub write($$)
$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};
diff --git a/source4/main.mk b/source4/main.mk
index a472bf5a25..458421f80d 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -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