[Android] Move extras tool building to compile-libvlc.sh

Jean-Baptiste Kempf git at videolan.org
Wed Feb 4 18:47:39 CET 2015


vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Feb  4 18:47:27 2015 +0100| [26bd66583841e93a5cace3b773b0f2bb8be391b5] | committer: Jean-Baptiste Kempf

Move extras tool building to compile-libvlc.sh

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=26bd66583841e93a5cace3b773b0f2bb8be391b5
---

 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 fd37238..bcbf48f 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 fb29e49..9502388 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 #
 ############



More information about the Android mailing list