From 159bad817a8fec79c59db13fc33717c7608d7b88 Mon Sep 17 00:00:00 2001 From: Tomek CEDRO Date: Sat, 25 Jun 2011 17:38:55 +0200 Subject: BOOTSTRAP/SUBMODULES: Minor fix for libswd submodule. Placed git init/update in at the top of bootstrap file. --- bootstrap | 21 +++++++++++---------- submodules/README | 2 ++ 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 submodules/README diff --git a/bootstrap b/bootstrap index 01fd7ea5..3b4b4783 100755 --- a/bootstrap +++ b/bootstrap @@ -1,18 +1,10 @@ #!/bin/sh # Bootstrap script fetches external git submodules and run autotools. +# Autotools create configure script and prepare Makefiles. + # Abort execution on error set -e -# Check if libtool is installed and what version. -if which libtoolize > /dev/null; then - libtoolize="libtoolize" -elif which glibtoolize >/dev/null; then - libtoolize="glibtoolize" -else - echo "$0: Error: libtool is required" >&2 - exit 1 -fi - # Submodules are external libraries downloaded from remote git repositories. # To be build automaticaly with OpenOCD. Do we want to skip submodules? if [ "$1" = "nosubmodule" ]; then @@ -31,6 +23,15 @@ else git submodule update fi +# Check if libtool is installed and what version. +if which libtoolize > /dev/null; then + libtoolize="libtoolize" +elif which glibtoolize >/dev/null; then + libtoolize="glibtoolize" +else + echo "$0: Error: libtool is required" >&2 + exit 1 +fi # Bootstrap the autotools (create Makefie.in files and configure script). ( diff --git a/submodules/README b/submodules/README new file mode 100644 index 00000000..ef92e1e7 --- /dev/null +++ b/submodules/README @@ -0,0 +1,2 @@ +Submodules are external utilities or libraries downloaded from external git +repositories to be built with OpenOCD. Submodules are handled by bootstrap. -- cgit v1.2.3