* 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/branches/1.4@84474 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 114c1656b95859ec1eba8699d2916542395be005..c4017bc7fc1b89bdb621d67e8f84cbd2acdf5041 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -712,7 +712,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 ff6f54717c1866b4baab3954e855a54f2a72fef4..c2adefc11d316863d391c660b1a808c26202c8ab 100755 (executable)
--- a/build_tools/prep_tarball
+++ b/build_tools/prep_tarball
@@ -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