don't blow up in the sub Makefiles if menuselect.makeopts is not present. This

is valid in some cases, such as "make clean". git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago · 9f2a6516cf
parent e832ae320f
commit 9f2a6516cf
9 changed files with 27 additions and 9 deletions
--- a/apps/Makefile
+++ b/apps/Makefile
@ -11,7 +11,9 @@
 # the GNU General Public License
 #

-include ../menuselect.makeopts
+ifneq ($(wildcard ../menuselect.makeopts),)
+  include ../menuselect.makeopts
+endif

 SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))

--- a/cdr/Makefile
+++ b/cdr/Makefile
@ -11,7 +11,9 @@
 # the GNU General Public License
 #

-include ../menuselect.makeopts
+ifneq ($(wildcard ../menuselect.makeopts),)
+  include ../menuselect.makeopts
+endif

 SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))

--- a/channels/Makefile
+++ b/channels/Makefile
@ -11,7 +11,9 @@
 # the GNU General Public License
 #

-include ../menuselect.makeopts
+ifneq ($(wildcard ../menuselect.makeopts),)
+  include ../menuselect.makeopts
+endif

 SELECTED_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))

--- a/codecs/Makefile
+++ b/codecs/Makefile
@ -11,7 +11,9 @@
 # the GNU General Public License
 #

-include ../menuselect.makeopts
+ifneq ($(wildcard ../menuselect.makeopts),)
+  include ../menuselect.makeopts
+endif

 SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))

--- a/formats/Makefile
+++ b/formats/Makefile
@ -11,7 +11,9 @@
 # the GNU General Public License
 #

-include ../menuselect.makeopts
+ifneq ($(wildcard ../menuselect.makeopts),)
+  include ../menuselect.makeopts
+endif

 SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c)))

--- a/funcs/Makefile
+++ b/funcs/Makefile
@ -11,7 +11,9 @@
 # the GNU General Public License
 #

-include ../menuselect.makeopts
+ifneq ($(wildcard ../menuselect.makeopts),)
+  include ../menuselect.makeopts
+endif

 SELECTED_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c)))

--- a/pbx/Makefile
+++ b/pbx/Makefile
@ -11,7 +11,9 @@
 # the GNU General Public License
 #

-include ../menuselect.makeopts
+ifneq ($(wildcard ../menuselect.makeopts),)
+  include ../menuselect.makeopts
+endif

 SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))

--- a/res/Makefile
+++ b/res/Makefile
@ -11,7 +11,9 @@
 # the GNU General Public License
 #

-include ../menuselect.makeopts
+ifneq ($(wildcard ../menuselect.makeopts),)
+  include ../menuselect.makeopts
+endif

 SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))

--- a/sounds/Makefile
+++ b/sounds/Makefile
@ -11,7 +11,9 @@
 # the GNU General Public License
 #

-include ../menuselect.makeopts
+ifneq ($(wildcard ../menuselect.makeopts),)
+  include ../menuselect.makeopts
+endif

 PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds