diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-06-19 00:14:16 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-06-19 00:14:16 +0000 |
commit | 9f2a6516cffe0986e11c1d364c0e8a80311c7692 (patch) | |
tree | bdaea59e72e1dd39a7824d83c075ffcfce48fe5e | |
parent | e832ae320f03d1916bba7557ce9fb40a2286514c (diff) |
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
-rw-r--r-- | apps/Makefile | 4 | ||||
-rw-r--r-- | cdr/Makefile | 4 | ||||
-rw-r--r-- | channels/Makefile | 4 | ||||
-rw-r--r-- | codecs/Makefile | 4 | ||||
-rw-r--r-- | formats/Makefile | 4 | ||||
-rw-r--r-- | funcs/Makefile | 4 | ||||
-rw-r--r-- | pbx/Makefile | 4 | ||||
-rw-r--r-- | res/Makefile | 4 | ||||
-rw-r--r-- | sounds/Makefile | 4 |
9 files changed, 27 insertions, 9 deletions
diff --git a/apps/Makefile b/apps/Makefile index 740f69993..1a93c83e3 100644 --- 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 8c56b22f5..fbfa17625 100644 --- 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 7958a5fd6..84d265159 100644 --- 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 42327b4e6..d4212a87d 100644 --- 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 560107b89..9913722d6 100644 --- 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 e8fbd5121..414b6fed8 100644 --- 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 02755e572..4c474998d 100644 --- 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 bb7f90894..f4d0f4b1e 100644 --- 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 dd3a3a3e5..53d6a24bc 100644 --- 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 |