diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-07-12 19:48:22 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-07-12 19:48:22 +0000 |
commit | 407c91a043284de05c20938e49e77e9e44a78d94 (patch) | |
tree | f60e07d3a666afc0b070e6d295a0547f4f7336a2 | |
parent | 90098fa198c031e9cbb99bc19220f592f52652d4 (diff) |
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
-rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |