GNU make already knows how to quietly ignore non-existent files in 'include' directives

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

diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 0963ced..82ee8e3 100644 (file)
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -95,9 +95,7 @@ install:: all
 
 uninstall::
 
-ifneq ($(wildcard .depend),)
- include .depend
-endif
+-include .depend
 
 depend: .depend
 

diff --git a/agi/Makefile b/agi/Makefile
index a6c52c9..743e0b9 100644 (file)
--- a/agi/Makefile
+++ b/agi/Makefile
@@ -40,9 +40,7 @@ clean-depend:
 clean: clean-depend
        rm -f *.so *.o look eagi-test eagi-sphinx-test
 
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend
 
 depend: .depend
 

diff --git a/apps/Makefile b/apps/Makefile
index 0373a3b..4b0b7a3 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.cc,%,$(wildcard app_*.cc)))

diff --git a/cdr/Makefile b/cdr/Makefile
index 08dc25a..dc765cc 100644 (file)
--- a/cdr/Makefile
+++ b/cdr/Makefile
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.cc,%,$(wildcard cdr_*.cc)))

diff --git a/channels/Makefile b/channels/Makefile
index 9cb7482..13c6b16 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.cc,%,$(wildcard chan_*.cc)))
@@ -66,9 +63,7 @@ clean::
        rm -f busy.h ringtone.h gentone
        $(MAKE) -C misdn clean
 
-ifneq ($(wildcard $(PWD)/Makefile.ast),)
-  include $(PWD)/Makefile.ast
-endif
+-include $(PWD)/Makefile.ast
 
 $(eval $(call ast_make_final_host,gentone,gentone.c))
 gentone: LIBS+=-lm

diff --git a/codecs/Makefile b/codecs/Makefile
index 9726979..cdc581d 100644 (file)
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -11,10 +11,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.cc,%,$(wildcard codec_*.cc)))

diff --git a/formats/Makefile b/formats/Makefile
index 6371753..2fb8214 100644 (file)
--- a/formats/Makefile
+++ b/formats/Makefile
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.cc,%,$(wildcard format_*.cc)))

diff --git a/funcs/Makefile b/funcs/Makefile
index eb087f4..1c4c193 100644 (file)
--- a/funcs/Makefile
+++ b/funcs/Makefile
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.cc,%,$(wildcard func_*.cc)))

diff --git a/main/Makefile b/main/Makefile
index ff90809..e2ae65e 100644 (file)
--- a/main/Makefile
+++ b/main/Makefile
@@ -11,14 +11,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include $(ASTTOPDIR)/menuselect.makeopts
-  include $(ASTTOPDIR)/menuselect.makedeps
-endif
-
-ifneq ($(wildcard $(ASTTOPDIR)/makeopts.embed_rules),)
-  include $(ASTTOPDIR)/makeopts.embed_rules
-endif
+-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps $(ASTTOPDIR)/makeopts.embed_rules
 
 all: asterisk
 

diff --git a/pbx/Makefile b/pbx/Makefile
index ee50fc7..056e204 100644 (file)
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.cc,%,$(wildcard pbx_*.cc)))

diff --git a/res/Makefile b/res/Makefile
index d7f3479..380f022 100644 (file)
--- a/res/Makefile
+++ b/res/Makefile
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.cc,%,$(wildcard res_*.cc)))

diff --git a/sounds/Makefile b/sounds/Makefile
index 60a1aba..fdefcd4 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -13,9 +13,7 @@
 
 .PHONY: dist-clean all uninstall
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include $(ASTTOPDIR)/menuselect.makeopts
-endif
+-include $(ASTTOPDIR)/menuselect.makeopts
 
 PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds

diff --git a/utils/Makefile b/utils/Makefile
index d59bfec..86cbd3c 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -100,9 +100,7 @@ streamplayer: streamplayer.o
 muted: muted.o
 muted: LIBS+=$(AUDIO_LIBS)
 
-ifneq ($(wildcard .depend),)
-  include .depend
-endif
+-include .depend
 
 depend: .depend