summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-04-01 12:26:00 +0100
committerMatthew Sackman <matthew@lshift.net>2010-04-01 12:26:00 +0100
commitb01aef7998500dddbc9173de9f08e22940f4c3ed (patch)
treed29c0a8ea735d6a13a4a0dd0d06e17b46a36aa80
parent3c3e3d0a4a35f07fb5c740e63c8f00b21b2bbad2 (diff)
downloadrabbitmq-server-b01aef7998500dddbc9173de9f08e22940f4c3ed.tar.gz
1. If our entire goalset is to make the deps file, don't include it; 2. We don't want the error msg when including the deps file when it doesn't exist, but at the same time we do want all errors if they occur when generating the deps. Hence -include is not permitted. Thus if we need the deps file then make it explicitly before including it.
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5c7089d4..3cf53e70 100644
--- a/Makefile
+++ b/Makefile
@@ -271,6 +271,11 @@ else
TESTABLEGOALS:=$(MAKECMDGOALS)
endif
+ifneq "$(strip $(TESTABLEGOALS))" "$(DEPS_FILE)"
ifneq "$(strip $(patsubst clean%,,$(patsubst %clean,,$(TESTABLEGOALS))))" ""
+ifeq "$(strip $(wildcard $(DEPS_FILE)))" ""
+_:=$(shell $(MAKE) $(DEPS_FILE))
+endif
include $(DEPS_FILE)
endif
+endif