From d12f54f90ba2b552ee964cc54674f4cd55a50cf6 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Sat, 26 Aug 2006 23:58:47 +0000 Subject: [PATCH] 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 --- Makefile.moddir_rules | 4 +--- agi/Makefile | 4 +--- apps/Makefile | 5 +---- cdr/Makefile | 5 +---- channels/Makefile | 9 ++------- codecs/Makefile | 5 +---- formats/Makefile | 5 +---- funcs/Makefile | 5 +---- main/Makefile | 9 +-------- pbx/Makefile | 5 +---- res/Makefile | 5 +---- sounds/Makefile | 4 +--- utils/Makefile | 4 +--- 13 files changed, 14 insertions(+), 55 deletions(-) diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 0963cedfca..82ee8e3734 100644 --- 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 a6c52c9182..743e0b9196 100644 --- 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 0373a3b637..4b0b7a39e2 100644 --- 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 08dc25a2d4..dc765ccc13 100644 --- 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 9cb7482fbc..13c6b16461 100644 --- 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 9726979e08..cdc581d3df 100644 --- 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 6371753834..2fb8214086 100644 --- 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 eb087f4328..1c4c193cfd 100644 --- 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 ff90809a38..e2ae65ef64 100644 --- 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 ee50fc72ae..056e2040b2 100644 --- 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 d7f3479003..380f022fe8 100644 --- 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 60a1aba902..fdefcd4b2b 100644 --- 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 d59bfec655..86cbd3c70b 100644 --- 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