From: Russell Bryant Date: Wed, 12 Jul 2006 19:48:22 +0000 (+0000) Subject: add "update" to the list of targets to ignore various included files for and X-Git-Tag: 1.4.0-beta1~605 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=407c91a043284de05c20938e49e77e9e44a78d94;p=thirdparty%2Fasterisk.git 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 6245175ee6..8be4c320f1 100644 --- 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