diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-10-02 20:07:15 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-10-02 20:07:15 +0000 |
| commit | 3c641c74de7b2c6c16fd8db96a71d30da134c8cf (patch) | |
| tree | eb381e832dfbce25978686af9ef761389d81d65a | |
| parent | f8e1a6d2e462606008a21b4e27a88a5fc9fb4266 (diff) | |
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
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | build_tools/prep_tarball | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -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 > $@ diff --git a/build_tools/prep_tarball b/build_tools/prep_tarball index d8a55be3d..9c0dd22c0 100755 --- a/build_tools/prep_tarball +++ b/build_tools/prep_tarball @@ -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 |