From d3beef4b59dc88a764bf5b9ec2c1cd3d8147be17 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 2 Oct 2007 20:06:07 +0000 Subject: [PATCH] * 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 --- Makefile | 2 +- build_tools/prep_tarball | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 114c1656b9..c4017bc7fc 100644 --- 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 ff6f54717c..c2adefc11d 100755 --- 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