[asterisk-commits] russell: branch 1.4 r84474 - in /branches/1.4: Makefile build_tools/prep_tarball

[SVN commits to the Asterisk project]

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

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84474
Log:
* 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:
    branches/1.4/Makefile
    branches/1.4/build_tools/prep_tarball

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?view=diff&rev=84474&r1=84473&r2=84474
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Tue Oct  2 15:06:07 2007
@@ -712,7 +712,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: branches/1.4/build_tools/prep_tarball
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/prep_tarball?view=diff&rev=84474&r1=84473&r2=84474
==============================================================================
--- branches/1.4/build_tools/prep_tarball (original)
+++ branches/1.4/build_tools/prep_tarball Tue Oct  2 15:06:07 2007
@@ -6,5 +6,3 @@
 # It will be executed from the top-level directory of the project.
 
 make -C sounds all MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget
-
-make menuselect-tree