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
This commit is contained in:
Russell Bryant
2006-06-19 00:14:16 +00:00
parent e832ae320f
commit 9f2a6516cf
9 changed files with 27 additions and 9 deletions

View File

@@ -11,7 +11,9 @@
# the GNU General Public License # 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))) SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))

View File

@@ -11,7 +11,9 @@
# the GNU General Public License # 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))) SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))

View File

@@ -11,7 +11,9 @@
# the GNU General Public License # 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))) SELECTED_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))

View File

@@ -11,7 +11,9 @@
# the GNU General Public License # 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))) SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))

View File

@@ -11,7 +11,9 @@
# the GNU General Public License # 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))) SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c)))

View File

@@ -11,7 +11,9 @@
# the GNU General Public License # 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))) SELECTED_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c)))

View File

@@ -11,7 +11,9 @@
# the GNU General Public License # 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))) SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))

View File

@@ -11,7 +11,9 @@
# the GNU General Public License # 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))) SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))

View File

@@ -11,7 +11,9 @@
# the GNU General Public License # the GNU General Public License
# #
include ../menuselect.makeopts ifneq ($(wildcard ../menuselect.makeopts),)
include ../menuselect.makeopts
endif
PWD:=$(shell pwd) PWD:=$(shell pwd)
SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds