diff options
| -rw-r--r-- | apps/Makefile | 2 | ||||
| -rw-r--r-- | build_tools/menuselect.c | 8 | ||||
| -rw-r--r-- | cdr/Makefile | 2 | ||||
| -rw-r--r-- | channels/Makefile | 2 | ||||
| -rw-r--r-- | codecs/Makefile | 2 | ||||
| -rw-r--r-- | formats/Makefile | 2 | ||||
| -rw-r--r-- | funcs/Makefile | 2 | ||||
| -rw-r--r-- | pbx/Makefile | 2 | ||||
| -rw-r--r-- | res/Makefile | 2 |
9 files changed, 16 insertions, 8 deletions
diff --git a/apps/Makefile b/apps/Makefile index 482bf2d3d..4d6f0bb55 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -11,6 +11,8 @@ # the GNU General Public License # +include ../menuselect.makeopts + SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c))) # If you have UnixODBC you can use ODBC voicemail diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c index ca23caf11..5e6130b10 100644 --- a/build_tools/menuselect.c +++ b/build_tools/menuselect.c @@ -698,14 +698,6 @@ int main(int argc, char *argv[]) free_trees(); free_member_list(); - if (check_deps && !existing_config && !res) { - fprintf(stderr, "\n***********************************************************\n"); - fprintf(stderr, "* menuselect.makeopts file generated with default values! *\n"); - fprintf(stderr, "* Please rerun make to build Asterisk. *\n"); - fprintf(stderr, "***********************************************************\n\n"); - res = -1; - } - /* In some cases, such as modifying the CFLAGS for the build, * a "make clean" needs to be forced. Removing the .lastclean * file does this. */ diff --git a/cdr/Makefile b/cdr/Makefile index 95020694d..644d2eb68 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -11,6 +11,8 @@ # the GNU General Public License # +include ../menuselect.makeopts + SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c))) #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. diff --git a/channels/Makefile b/channels/Makefile index 060d4e1fb..6f308ab54 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -11,6 +11,8 @@ # the GNU General Public License # +include ../menuselect.makeopts + SELECTED_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c))) ifeq ($(OSARCH),OpenBSD) diff --git a/codecs/Makefile b/codecs/Makefile index 544f5b116..c96fc8952 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -11,6 +11,8 @@ # the GNU General Public License # +include ../menuselect.makeopts + SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c))) ifeq ($(wildcard ilbc/iLBC_decode.h),) diff --git a/formats/Makefile b/formats/Makefile index 1eb7e29ff..f72424797 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -11,6 +11,8 @@ # the GNU General Public License # +include ../menuselect.makeopts + SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c))) GSMLIB=../codecs/gsm/lib/libgsm.a diff --git a/funcs/Makefile b/funcs/Makefile index 757f2accf..e8fbd5121 100644 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -11,6 +11,8 @@ # the GNU General Public License # +include ../menuselect.makeopts + SELECTED_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c))) # TODO This check needs to be handled with autoconf diff --git a/pbx/Makefile b/pbx/Makefile index 8ca959688..c6332d669 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -11,6 +11,8 @@ # the GNU General Public License # +include ../menuselect.makeopts + SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c))) MOC=$(QTDIR)/bin/moc diff --git a/res/Makefile b/res/Makefile index 8de05f30b..601e2f3c9 100644 --- a/res/Makefile +++ b/res/Makefile @@ -11,6 +11,8 @@ # the GNU General Public License # +include ../menuselect.makeopts + SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c))) ifeq ($(OSARCH),FreeBSD) |