Skip to content
Snippets Groups Projects
Commit 4c41a6cc authored by Russell Bryant's avatar Russell Bryant
Browse files

merge menuselect_build ... most of the changes happened in menuselect

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40877 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent e0df1dfd
No related branches found
No related tags found
No related merge requests found
...@@ -319,10 +319,9 @@ clean: $(SUBDIRS_CLEAN) clean-depend ...@@ -319,10 +319,9 @@ clean: $(SUBDIRS_CLEAN) clean-depend
dist-clean: distclean dist-clean: distclean
distclean: clean distclean: clean
@$(MAKE) -C mxml clean
@$(MAKE) -C menuselect dist-clean @$(MAKE) -C menuselect dist-clean
@$(MAKE) -C sounds dist-clean @$(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts makeopts.xml menuselect.makedeps rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules rm -f makeopts.embed_rules
rm -f config.log config.status rm -f config.log config.status
rm -rf autom4te.cache rm -rf autom4te.cache
...@@ -646,12 +645,8 @@ uninstall-all: _uninstall ...@@ -646,12 +645,8 @@ uninstall-all: _uninstall
menuselect: menuselect/menuselect menuselect-tree menuselect: menuselect/menuselect menuselect-tree
-@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || 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 mxml/libmxml.a menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
@CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect CC="$(HOST_CC)" menuselect @CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect CC="$(HOST_CC)"
mxml/libmxml.a:
@cd mxml && unset CC CFLAGS LDFLAGS && test -f config.h || ./configure --build=$(BUILD_PLATFORM) --host=$(BUILD_PLATFORM)
$(MAKE) -C mxml libmxml.a
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 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
@echo "Generating input for menuselect ..." @echo "Generating input for menuselect ..."
......
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