remove the need to have to re-run make after a default menuselect.makeopts

file is generated.  This allows a fresh checkout of asterisk to be built
and installed with the standard "./configure && make && make install".

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32798 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/Makefile b/apps/Makefile
index 482bf2d..4d6f0bb 100644 (file)
--- 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 ca23caf..5e6130b 100644 (file)
--- 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 9502069..644d2eb 100644 (file)
--- 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 060d4e1..6f308ab 100644 (file)
--- 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 544f5b1..c96fc89 100644 (file)
--- 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 1eb7e29..f724247 100644 (file)
--- 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 757f2ac..e8fbd51 100644 (file)
--- 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 8ca9596..c6332d6 100644 (file)
--- 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 8de05f3..601e2f3 100644 (file)
--- 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)