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

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Aug 13 20:57:57 2006
New Revision: 278

URL: http://svn.digium.com/view/asterisk-addons?rev=278&view=rev
Log:
don't try to include menuselect and configure output files if the target is
clean, distclean, or update

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-addons/trunk/Makefile?rev=278&r1=277&r2=278&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Aug 13 20:57:57 2006
@@ -27,13 +27,17 @@
 GLOBAL_MAKEOPTS=$(wildcard /etc/asteriskaddons.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asteriskaddons.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
 
 ifeq ($(OSARCH),SunOS)