add "update" to the list of targets to ignore various included files for and

check the targets in a little bit different way

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

diff --git a/Makefile b/Makefile
index 6245175ee65afea4276459e99472ad967e69687b..8be4c320f1b4e4f22a3cbc20fee630e8b8154a9d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -123,14 +123,14 @@ GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
 ifneq ($(wildcard menuselect.makeopts),)
- ifeq ($(findstring clean,$(MAKECMDGOALS))$(findstring distclean,$(MAKECMDGOALS)),)
+ ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
   include menuselect.makeopts
   include menuselect.makedeps
  endif
 endif
 
 ifneq ($(wildcard makeopts),)
- ifeq ($(findstring clean,$(MAKECMDGOALS))$(findstring distclean,$(MAKECMDGOALS)),)
+ ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
   include makeopts
  endif
 endif
@@ -427,13 +427,13 @@ db1-ast/libdb1.a:
        $(MAKE) -C db1-ast libdb1.a
 
 ifneq ($(wildcard .depend),)
- ifeq ($(findstring clean,$(MAKECMDGOALS))$(findstring distclean,$(MAKECMDGOALS)),)
+ ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
   include .depend
  endif
 endif
 
 ifneq ($(wildcard .tags-depend),)
- ifeq ($(findstring clean,$(MAKECMDGOALS))$(findstring distclean,$(MAKECMDGOALS)),)
+ ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
   include .tags-depend
  endif
 endif