From 407c91a043284de05c20938e49e77e9e44a78d94 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 12 Jul 2006 19:48:22 +0000 Subject: 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 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6245175ee..8be4c320f 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 -- cgit v1.2.3