From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 14 Aug 2006 02:00:28 +0000 (+0000)
Subject: don't include files that cause additional targets to get executed if the target
X-Git-Tag: 1.4.0-beta1~420
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=781f9dbcaf983c9550eda7cdd4933432966f8ace;p=thirdparty%2Fasterisk.git

don't include files that cause additional targets to get executed if the target
called was clean, distclean, or update


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 9e250b1948..bb0accdf76 100644
--- a/Makefile
+++ b/Makefile
@@ -131,13 +131,17 @@ ASTCFLAGS=
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
-ifneq ($(wildcard menuselect.makeopts),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard menuselect.makeopts),)
   include menuselect.makeopts
   include menuselect.makedeps
+ endif
 endif
 
-ifneq ($(wildcard makeopts),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard makeopts),)
   include makeopts
+ endif
 endif
 
 TOPDIR_CFLAGS=-Iinclude
@@ -431,12 +435,16 @@ editline/libedit.a:
 db1-ast/libdb1.a:
 	$(MAKE) -C db1-ast libdb1.a
 
-ifneq ($(wildcard .depend),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard .depend),)
   include .depend
+ endif
 endif
 
-ifneq ($(wildcard .tags-depend),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard .tags-depend),)
   include .tags-depend
+ endif
 endif
 
 ast_expr2.c ast_expr2.h: