[svn-commits] russell: trunk r39640 - /trunk/Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Aug 13 21:00:28 2006
New Revision: 39640

URL: http://svn.digium.com/view/asterisk?rev=39640&view=rev
Log:
don't include files that cause additional targets to get executed if the target
called was clean, distclean, or update

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=39640&r1=39639&r2=39640&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Aug 13 21:00:28 2006
@@ -131,13 +131,17 @@
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
-ifneq ($(wildcard menuselect.makeopts),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard menuselect.makeopts),)
   include menuselect.makeopts
   include menuselect.makedeps
-endif
-
-ifneq ($(wildcard makeopts),)
+ endif
+endif
+
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard makeopts),)
   include makeopts
+ endif
 endif
 
 TOPDIR_CFLAGS=-Iinclude
@@ -431,12 +435,16 @@
 db1-ast/libdb1.a:
 	$(MAKE) -C db1-ast libdb1.a
 
-ifneq ($(wildcard .depend),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard .depend),)
   include .depend
-endif
-
-ifneq ($(wildcard .tags-depend),)
+ endif
+endif
+
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard .tags-depend),)
   include .tags-depend
+ endif
 endif
 
 ast_expr2.c ast_expr2.h: