From 9f2a6516cffe0986e11c1d364c0e8a80311c7692 Mon Sep 17 00:00:00 2001 From: Russell Bryant <russell@russellbryant.com> Date: Mon, 19 Jun 2006 00:14:16 +0000 Subject: [PATCH] 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 --- apps/Makefile | 4 +++- cdr/Makefile | 4 +++- channels/Makefile | 4 +++- codecs/Makefile | 4 +++- formats/Makefile | 4 +++- funcs/Makefile | 4 +++- pbx/Makefile | 4 +++- res/Makefile | 4 +++- sounds/Makefile | 4 +++- 9 files changed, 27 insertions(+), 9 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 740f69993a..1a93c83e31 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 8c56b22f5d..fbfa176254 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 7958a5fd6a..84d2651592 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 42327b4e6e..d4212a87d5 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 560107b898..9913722d63 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 e8fbd5121d..414b6fed8f 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 02755e5724..4c474998d2 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 bb7f90894d..f4d0f4b1e7 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 dd3a3a3e52..53d6a24bc2 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 -- GitLab