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

diff --git a/apps/Makefile b/apps/Makefile
index 740f69993afe57bb29e9a71430579f7964a188d1..1a93c83e3183dee61808c5d55b5f9878cbc738a1 100644 (file)
--- 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)))
 

diff --git a/cdr/Makefile b/cdr/Makefile
index 8c56b22f5d0b95c603f6783e0fde8c2523db3e5f..fbfa17625405acec5296a1909a7a5a5d018d3876 100644 (file)
--- 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)))
 

diff --git a/channels/Makefile b/channels/Makefile
index 7958a5fd6a072a89accee2b4179000315032b66e..84d2651592078afbbb494b2fb3c3d098fd978886 100644 (file)
--- 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)))
 

diff --git a/codecs/Makefile b/codecs/Makefile
index 42327b4e6e2a3a76493b334e9e29cc63fb104713..d4212a87d559168aff1985569be8c441b29e90dd 100644 (file)
--- 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)))
 

diff --git a/formats/Makefile b/formats/Makefile
index 560107b89865ce87fa07b1a08ee7f6abf77b4394..9913722d631c02afb75c8177bccf67a3c0589332 100644 (file)
--- 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)))
 

diff --git a/funcs/Makefile b/funcs/Makefile
index e8fbd5121dd63847d3358e55bcaf47a7924c3728..414b6fed8f5cf15d1bdec85b46a8586a0152cd28 100644 (file)
--- 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)))
 

diff --git a/pbx/Makefile b/pbx/Makefile
index 02755e5724f887ed4144de2c51f87a6000cfceec..4c474998d2906a48c98caa86b0c413004ebb859b 100644 (file)
--- 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)))
 

diff --git a/res/Makefile b/res/Makefile
index bb7f90894de475dd0124684c218397d066800e8b..f4d0f4b1e709422212d2ec81788159bfe7b2bec9 100644 (file)
--- 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)))
 

diff --git a/sounds/Makefile b/sounds/Makefile
index dd3a3a3e520015573ff368d6c2b3bcb924be2010..53d6a24bc2a69cf773411f6b7733a48590b69163 100644 (file)
--- 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