[svn-commits] trunk r32798 - in /trunk: apps/ build_tools/ cdr/ channels/ codecs/ formats/ ...

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Jun  7 11:03:31 2006
New Revision: 32798

URL: http://svn.digium.com/view/asterisk?rev=32798&view=rev
Log:
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".

Modified:
    trunk/apps/Makefile
    trunk/build_tools/menuselect.c
    trunk/cdr/Makefile
    trunk/channels/Makefile
    trunk/codecs/Makefile
    trunk/formats/Makefile
    trunk/funcs/Makefile
    trunk/pbx/Makefile
    trunk/res/Makefile

Modified: trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/apps/Makefile?rev=32798&r1=32797&r2=32798&view=diff
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Wed Jun  7 11:03:31 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+include ../menuselect.makeopts
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
 

Modified: trunk/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/menuselect.c?rev=32798&r1=32797&r2=32798&view=diff
==============================================================================
--- trunk/build_tools/menuselect.c (original)
+++ trunk/build_tools/menuselect.c Wed Jun  7 11:03:31 2006
@@ -698,14 +698,6 @@
 	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. */

Modified: trunk/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/cdr/Makefile?rev=32798&r1=32797&r2=32798&view=diff
==============================================================================
--- trunk/cdr/Makefile (original)
+++ trunk/cdr/Makefile Wed Jun  7 11:03:31 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+include ../menuselect.makeopts
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))
 

Modified: trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/Makefile?rev=32798&r1=32797&r2=32798&view=diff
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Wed Jun  7 11:03:31 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+include ../menuselect.makeopts
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))
 

Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?rev=32798&r1=32797&r2=32798&view=diff
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Wed Jun  7 11:03:31 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+include ../menuselect.makeopts
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))
 

Modified: trunk/formats/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/formats/Makefile?rev=32798&r1=32797&r2=32798&view=diff
==============================================================================
--- trunk/formats/Makefile (original)
+++ trunk/formats/Makefile Wed Jun  7 11:03:31 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+include ../menuselect.makeopts
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c)))
 

Modified: trunk/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/funcs/Makefile?rev=32798&r1=32797&r2=32798&view=diff
==============================================================================
--- trunk/funcs/Makefile (original)
+++ trunk/funcs/Makefile Wed Jun  7 11:03:31 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+include ../menuselect.makeopts
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c)))
 

Modified: trunk/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/pbx/Makefile?rev=32798&r1=32797&r2=32798&view=diff
==============================================================================
--- trunk/pbx/Makefile (original)
+++ trunk/pbx/Makefile Wed Jun  7 11:03:31 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+include ../menuselect.makeopts
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))
 

Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=32798&r1=32797&r2=32798&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Wed Jun  7 11:03:31 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+include ../menuselect.makeopts
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))