aboutsummaryrefslogtreecommitdiffstats
path: root/channels/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-26 23:58:47 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-26 23:58:47 +0000
commit0ba6df7e0185d4a336554689485ba0d4431dc281 (patch)
tree8ba407ce404b102e6859ae992fe30aee459ef8b7 /channels/Makefile
parentd60ef591f32d5d690891dc0ea476d853ad265b45 (diff)
GNU make already knows how to quietly ignore non-existent files in 'include' directives
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41209 f38db490-d61c-443f-a65b-d21fe96a405b
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