From 19dda440b112d019b9fe24c782077846c75a84f3 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Wed, 7 Nov 2007 11:15:42 +0000 Subject: match changes in menuselect's Makefile git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89082 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e7d6897fe..5c8e2e280 100644 --- a/Makefile +++ b/Makefile @@ -749,11 +749,15 @@ menuselect: menuselect/menuselect menuselect-tree gmenuselect: menuselect/gmenuselect menuselect-tree -@menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" -menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts +menuselect/menuselect: menuselect/makeopts + echo "doing menuselect with $(HOST_CC)" @CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" -menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts - @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent" +menuselect/gmenuselect: menuselect/makeopts + @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect gmenuselect CONFIGURE_SILENT="--silent" + +menuselect/makeopts: + @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C makeopts CONFIGURE_SILENT="--silent" menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml configure @echo "Generating input for menuselect ..." -- cgit v1.2.3