summaryrefslogtreecommitdiff
path: root/channels/Makefile
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-08-26 23:58:47 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-08-26 23:58:47 +0000
commitd12f54f90ba2b552ee964cc54674f4cd55a50cf6 (patch)
tree8ba407ce404b102e6859ae992fe30aee459ef8b7 /channels/Makefile
parenta757ca294799f7e014b3dd7083943ac7e1630614 (diff)
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
Diffstat (limited to 'channels/Makefile')
-rw-r--r--channels/Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/channels/Makefile b/channels/Makefile
index 9cb7482fb..13c6b1646 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