diff options
author | Sean Bright <sean@malleable.com> | 2008-09-12 18:06:41 +0000 |
---|---|---|
committer | Sean Bright <sean@malleable.com> | 2008-09-12 18:06:41 +0000 |
commit | 1d2e04ec63239f1b343129f796050d99bf7ad04e (patch) | |
tree | 375e40a508c47add410de7d6db2c7a2a89a56c81 /Makefile | |
parent | 3b00d2ce83848f26fb4fca30b97ebfa4dfb285f4 (diff) |
A few changes:
1) Start using menuselect trunk
2) Bring in changes similar to those in asterisk trunk so that
'make menuselect' works as it should from the dahdi-tools
directory.
3) Stop looking for curses/ncurses in the top level configure
since nothing uses it (except menuselect which will find it
on it's own).
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4904 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 52 |
1 files changed, 46 insertions, 6 deletions
@@ -331,16 +331,56 @@ config.status: configure @echo "****" @exit 1 -menuselect.makeopts: menuselect/menuselect menuselect-tree - @menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@ +menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts + menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuconfig: menuselect -menuselect: menuselect/menuselect menuselect-tree - -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" +cmenuconfig: cmenuselect -menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status - @CFLAGS="" $(MAKE) -C menuselect CC=$(HOSTCC) +gmenuconfig: gmenuselect + +nmenuconfig: nmenuselect + +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; \ + else \ + echo "No menuselect user interface found. Install ncurses,"; \ + echo "newt or GTK libraries to build one and re-rerun"; \ + echo "'make menuselect'."; \ + fi + +cmenuselect: menuselect/cmenuselect menuselect-tree + -@menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" + +gmenuselect: menuselect/gmenuselect menuselect-tree + -@menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" + +nmenuselect: menuselect/nmenuselect menuselect-tree + -@menuselect/nmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" + +# options for make in menuselect/ +MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" + +menuselect/menuselect: menuselect/makeopts + $(MAKE_MENUSELECT) menuselect + +menuselect/cmenuselect: menuselect/makeopts + $(MAKE_MENUSELECT) cmenuselect + +menuselect/gmenuselect: menuselect/makeopts + $(MAKE_MENUSELECT) gmenuselect + +menuselect/nmenuselect: menuselect/makeopts + $(MAKE_MENUSELECT) nmenuselect + +menuselect/makeopts: makeopts + $(MAKE_MENUSELECT) makeopts menuselect-tree: dahdi.xml @echo "Generating input for menuselect ..." |