dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

use batch-mode (no user interface) menuselect for --check-deps operations 

move automatic user interface selection for menuselect to this Makefile



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@126152 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2008-06-28 14:34:07 +00:00
parent 7b18edac55
commit e97a7cce7f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -73,12 +73,12 @@ export PROC # Processor type
export NOISY_BUILD # Used in Makefile.rules
export MENUSELECT_CFLAGS # Options selected in menuselect.
export AST_DEVMODE # Set to "yes" for additional compiler
# and runtime checks
# and runtime checks
export SOLINK # linker flags for shared objects
export STATIC_BUILD # Additional cflags, set to -static
# for static builds. Probably
# should go directly to ASTLDFLAGS
# for static builds. Probably
# should go directly to ASTLDFLAGS
#--- paths to various commands
export CC
@ -826,8 +826,14 @@ gmenuconfig: gmenuselect
nmenuconfig: nmenuselect
menuselect: menuselect/menuselect menuselect-tree
-@menuselect/menuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
@if [ -x menuselect/nmenuselect ]; then \
$(MAKE) nmenuselect; \
elif [ -x menuselect/cmenuselect ]; then \
$(MAKE) cmenuselect; \
elif [ -x menuselect/gmenuselect ]; then \
$(MAKE) gmenuselect; \
fi
cmenuselect: menuselect/cmenuselect menuselect-tree
-@menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
@ -842,7 +848,7 @@ nmenuselect: menuselect/nmenuselect menuselect-tree
MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
menuselect/menuselect: menuselect/makeopts
$(MAKE_MENUSELECT)
$(MAKE_MENUSELECT) menuselect
menuselect/cmenuselect: menuselect/makeopts
$(MAKE_MENUSELECT) cmenuselect