[asterisk-commits] trunk r37477 - /trunk/Makefile

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Jul 12 14:48:22 2006
New Revision: 37477

URL: http://svn.digium.com/view/asterisk?rev=37477&view=rev
Log:
add "update" to the list of targets to ignore various included files for and
check the targets in a little bit different way

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=37477&r1=37476&r2=37477&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jul 12 14:48:22 2006
@@ -123,14 +123,14 @@
 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 @@
 	$(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