From 26bd66583841e93a5cace3b773b0f2bb8be391b5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Wed, 4 Feb 2015 18:47:27 +0100 Subject: [PATCH] Move extras tool building to compile-libvlc.sh --- compile-libvlc.sh | 11 ++++++++++- compile.sh | 8 -------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/compile-libvlc.sh b/compile-libvlc.sh index fd372381d..bcbf48f3c 100755 --- a/compile-libvlc.sh +++ b/compile-libvlc.sh @@ -115,12 +115,21 @@ else OPTS="--enable-debug" fi +########################### +# Build buildsystem tools # +########################### +export PATH=`pwd`/extras/tools/build/bin:$PATH +echo "Building tools" +cd extras/tools +./bootstrap +make $MAKEFLAGS +cd ../.. ############# # BOOTSTRAP # ############# -if [ ! -f config.h ]; then +if [ ! -f configure ]; then echo "Bootstraping" ./bootstrap fi diff --git a/compile.sh b/compile.sh index fb29e4956..95023887b 100755 --- a/compile.sh +++ b/compile.sh @@ -227,14 +227,6 @@ if [ -z "$MAKEFLAGS" ]; then fi fi -# Build buildsystem tools -export PATH=`pwd`/extras/tools/build/bin:$PATH -echo "Building tools" -cd extras/tools -./bootstrap -make $MAKEFLAGS -cd ../.. - ############ # Make VLC # ############ -- GitLab