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 482bf2d3d2559c7da3f19c2809f0a0178d2916eb..4d6f0bb55f2cf6d43e3705755dfa60324998c2e9 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 ca23caf112c1885faa8f63f8c2b3226fecbf9e2b..5e6130b1038dab43b28155df1e04625fd5c6ecd5 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 95020694d711aad868882a2a6ce8a4b92bf1eb52..644d2eb685882b61ecf7bf58527c754049d5c37a 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 060d4e1fbc4a8f11c0ada202f4b0fe25048d89d6..6f308ab5484716acde40ae0076df4206977e1de3 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 544f5b116469c411bc2998866469abeb77a3c8be..c96fc8952ca01d4418591b979ade8ebb0b98447f 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 1eb7e29fff9b2c357b88a3dc677d29fccfc369d7..f72424797f96a7b7f398c3eead8f356c2e00c8c4 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 757f2accf2c7ad5b9bd2378ba445c65a79729dc9..e8fbd5121dd63847d3358e55bcaf47a7924c3728 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 8ca959688e398a4bc21e138598fafe2d42d0c27b..c6332d669cff8ce33990bd74dd40de109d741d66 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 8de05f30b8f7078bb9b6f815862fdd2c854ef750..601e2f3c952631fde42af92a1e9e2eea131f0652 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)