summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-22 10:33:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:21 -0500
commitacedd59f35b688e5545cf63908a94e8846dc3cd7 (patch)
tree360ec167a7d9031b6d548623568a13f58dcf4847
parentca33b7e675fb054cdd5cdb7c938c1c05cecc231e (diff)
downloadsamba-acedd59f35b688e5545cf63908a94e8846dc3cd7.tar.gz
samba-acedd59f35b688e5545cf63908a94e8846dc3cd7.tar.bz2
samba-acedd59f35b688e5545cf63908a94e8846dc3cd7.zip
r22451: allow
SKIP_DEP_FILES=yes make metze (This used to be commit 31fab208f63f0ee3fb1838c9b59421feb5752948)
-rw-r--r--source4/build/smb_build/makefile.pm8
-rw-r--r--source4/main.mk4
2 files changed, 8 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 433fd9658b..1102e85fef 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -637,10 +637,18 @@ sub write($$)
ifneq (\$(MAKECMDGOALS),clean)
ifneq (\$(MAKECMDGOALS),distclean)
ifneq (\$(MAKECMDGOALS),realdistclean)
+ifneq (\$(SKIP_DEP_FILES),yes)
-include \$(DEP_FILES)
endif
endif
endif
+endif
+
+ifneq (\$(SKIP_DEP_FILES),yes)
+clean::
+ \@echo Removing dependency files
+ \@find . -name '*.d' -o -name '*.hd' | xargs rm -f
+endif
");
} else {
$self->output("include \$(srcdir)/static_deps.mk\n");
diff --git a/source4/main.mk b/source4/main.mk
index 4084d7ba4b..88eebe963a 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -421,7 +421,3 @@ dist:: distclean idl_full manpages configure
configure:
./autogen.sh
-
-clean::
- @echo Removing dependency files
- @find . -name \*.d -o -name \*.hd | xargs rm -f