Merged revisions 84474 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84474 | russell | 2007-10-02 15:06:07 -0500 (Tue, 02 Oct 2007) | 5 lines

* Don't build the menuselect-tree for the tarball, as it requires running the
  configure script first
* Change the Makefile to note that menuselect-tree depends on the configure
  script.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant 2007-10-02 20:07:15 +00:00
parent f8e1a6d2e4
commit 3c641c74de
2 changed files with 1 additions and 3 deletions

View File

@ -728,7 +728,7 @@ menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_cu
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-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 configure
@echo "Generating input for menuselect ..."
@build_tools/prep_moduledeps > $@

View File

@ -7,8 +7,6 @@
make -C sounds all MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget
make menuselect-tree
VERSION=`cat .version`
sed -i -e "s/ASTERISKVERSION/${VERSION}/" doc/tex/asterisk.tex
cd doc/tex && rubber --pdf asterisk.tex