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
19 years ago · d12f54f90b
parent a757ca2947
commit d12f54f90b
13 changed files with 14 additions and 55 deletions
--- 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

--- 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

--- 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)))
--- 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)))
--- 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
--- 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)))
--- 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)))
--- 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)))
--- 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

--- 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)))
--- 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)))
--- 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
--- 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