revert this change for now since it isn't working correctly and there are more
authorRussell Bryant <russell@russellbryant.com>
Wed, 12 Jul 2006 20:27:46 +0000 (20:27 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 12 Jul 2006 20:27:46 +0000 (20:27 +0000)
important issues to work on at the moment ...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37483 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 8be4c32..e21b79a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -123,16 +123,12 @@ GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
 ifneq ($(wildcard menuselect.makeopts),)
- ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
   include menuselect.makeopts
   include menuselect.makedeps
- endif
 endif
 
 ifneq ($(wildcard makeopts),)
- ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
   include makeopts
- endif
 endif
 
 TOPDIR_CFLAGS=-Iinclude
@@ -427,15 +423,11 @@ db1-ast/libdb1.a:
        $(MAKE) -C db1-ast libdb1.a
 
 ifneq ($(wildcard .depend),)
- ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
   include .depend
- endif
 endif
 
 ifneq ($(wildcard .tags-depend),)
- ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
   include .tags-depend
- endif
 endif
 
 ast_expr2.c ast_expr2.h: