Skip to content
Snippets Groups Projects
Commit 615d69cc authored by Kevin P. Fleming's avatar Kevin P. Fleming
Browse files

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

move automatic user interface selection for menuselect to this Makefile



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 8ddc7e94
No related branches found
No related tags found
No related merge requests found
...@@ -73,12 +73,12 @@ export PROC # Processor type ...@@ -73,12 +73,12 @@ export PROC # Processor type
export NOISY_BUILD # Used in Makefile.rules export NOISY_BUILD # Used in Makefile.rules
export MENUSELECT_CFLAGS # Options selected in menuselect. export MENUSELECT_CFLAGS # Options selected in menuselect.
export AST_DEVMODE # Set to "yes" for additional compiler export AST_DEVMODE # Set to "yes" for additional compiler
# and runtime checks # and runtime checks
export SOLINK # linker flags for shared objects export SOLINK # linker flags for shared objects
export STATIC_BUILD # Additional cflags, set to -static export STATIC_BUILD # Additional cflags, set to -static
# for static builds. Probably # for static builds. Probably
# should go directly to ASTLDFLAGS # should go directly to ASTLDFLAGS
#--- paths to various commands #--- paths to various commands
export CC export CC
...@@ -826,8 +826,14 @@ gmenuconfig: gmenuselect ...@@ -826,8 +826,14 @@ gmenuconfig: gmenuselect
nmenuconfig: nmenuselect nmenuconfig: nmenuselect
menuselect: menuselect/menuselect menuselect-tree menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
-@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!" @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 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!" -@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 ...@@ -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" MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
menuselect/menuselect: menuselect/makeopts menuselect/menuselect: menuselect/makeopts
$(MAKE_MENUSELECT) $(MAKE_MENUSELECT) menuselect
menuselect/cmenuselect: menuselect/makeopts menuselect/cmenuselect: menuselect/makeopts
$(MAKE_MENUSELECT) cmenuselect $(MAKE_MENUSELECT) cmenuselect
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment