[asterisk-commits] russell: trunk r84475 - in /trunk: ./ Makefile build_tools/prep_tarball

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Oct  2 15:07:15 2007
New Revision: 84475

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84475
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/build_tools/prep_tarball

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=84475&r1=84474&r2=84475
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Oct  2 15:07:15 2007
@@ -728,7 +728,7 @@
 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 > $@
 

Modified: trunk/build_tools/prep_tarball
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/prep_tarball?view=diff&rev=84475&r1=84474&r2=84475
==============================================================================
--- trunk/build_tools/prep_tarball (original)
+++ trunk/build_tools/prep_tarball Tue Oct  2 15:07:15 2007
@@ -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