Skip to content

V
vlc-gpu
Commit 0154ce07 authored by Faustino Osuna's avatar Faustino Osuna
Browse files
Options

contrib/bootstrap: White space clean up.

parent 5ee24a11
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 84 deletions
extras/contrib/bootstrap
View file @ 0154ce07
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
# *************************************************************************** # ***************************************************************************
if test "$#" -gt "2" -o "$1" = "-h" -o "$1" = "--help" ; then if test "$#" -gt "2" -o "$1" = "-h" -o "$1" = "--help" ; then
echo "Usage: $0 [host [distro]]" >&2 echo "Usage: $0 [host [distro]]" >&2
echo " Prepare config.mak and distro.mak file." >&2 echo " Prepare config.mak and distro.mak file." >&2
exit 1 exit 1
fi fi
LANG=C LANG=C
...@@ -37,9 +37,9 @@ set -x ...@@ -37,9 +37,9 @@ set -x
BUILD=`gcc -dumpmachine` BUILD=`gcc -dumpmachine`
if test "$#" -ge "1"; then if test "$#" -ge "1"; then
HOST="$1" HOST="$1"
else else
HOST="$BUILD" HOST="$BUILD"
fi fi
DISTRO= DISTRO=
...@@ -112,7 +112,7 @@ case $HOST in ...@@ -112,7 +112,7 @@ case $HOST in
LD="ld -arch ppc -syslibroot \${MACOSX_SDK}" LD="ld -arch ppc -syslibroot \${MACOSX_SDK}"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
cat src/Distributions/darwin.mak >> distro.mak cat src/Distributions/darwin.mak >> distro.mak
;; ;;
i686-apple-darwin8) i686-apple-darwin8)
SDK_TARGET=10.4 SDK_TARGET=10.4
echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
...@@ -124,7 +124,7 @@ case $HOST in ...@@ -124,7 +124,7 @@ case $HOST in
EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
cat src/Distributions/darwin.mak >> distro.mak cat src/Distributions/darwin.mak >> distro.mak
;; ;;
powerpc-apple-darwin9) powerpc-apple-darwin9)
# Mac OS X 10.5 with Xcode 3, specific rules apply # Mac OS X 10.5 with Xcode 3, specific rules apply
SDK_TARGET=10.4 SDK_TARGET=10.4
...@@ -145,7 +145,7 @@ case $HOST in ...@@ -145,7 +145,7 @@ case $HOST in
echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2 echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
exit 1 exit 1
fi fi
;; ;;
i686-apple-darwin9) i686-apple-darwin9)
SDK_TARGET=10.4 SDK_TARGET=10.4
MIN_LD_VERSION_WITH_TEXT_RELOCATION=81 MIN_LD_VERSION_WITH_TEXT_RELOCATION=81
...@@ -168,89 +168,89 @@ case $HOST in ...@@ -168,89 +168,89 @@ case $HOST in
echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2 echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
exit 1 exit 1
fi fi
;; ;;
i586-pc-beos) i586-pc-beos)
if test -f /boot/beos/system/lib/libbind.so; then if test -f /boot/beos/system/lib/libbind.so; then
EXTRA_LDFLAGS=" -lbind -lsocket" EXTRA_LDFLAGS=" -lbind -lsocket"
else else
EXTRA_LDFLAGS=" -lnet" EXTRA_LDFLAGS=" -lnet"
fi fi
if test "$HOST" = "$BUILD"; then if test "$HOST" = "$BUILD"; then
# Compiling on BeOS # Compiling on BeOS
PATH=".:/boot/home/config/bin:/bin:/boot/apps" PATH=".:/boot/home/config/bin:/bin:/boot/apps"
PATH="${PATH}:/boot/preferences:/boot/beos/apps" PATH="${PATH}:/boot/preferences:/boot/beos/apps"
PATH="${PATH}:/boot/beos/preferences" PATH="${PATH}:/boot/beos/preferences"
PATH="${PATH}:/boot/develop/tools/gnupro/bin" PATH="${PATH}:/boot/develop/tools/gnupro/bin"
echo "PATH = ${PATH}" >> config.mak echo "PATH = ${PATH}" >> config.mak
LIBRARY_PATH="${LIBRARY_PATH}:%A/lib:/boot/home/config/lib" LIBRARY_PATH="${LIBRARY_PATH}:%A/lib:/boot/home/config/lib"
LIBRARY_PATH="${LIBRARY_PATH}:/boot/beos/system/lib" LIBRARY_PATH="${LIBRARY_PATH}:/boot/beos/system/lib"
echo "LIBRARY_PATH = ${LIBRARY_PATH}" >> config.mak echo "LIBRARY_PATH = ${LIBRARY_PATH}" >> config.mak
else else
# Cross compiling from Linux # Cross compiling from Linux
PATH="/opt/beos-tools/bin:/opt/cross-tools/bin" PATH="/opt/beos-tools/bin:/opt/cross-tools/bin"
PATH="${PATH}:/usr/bin:/bin" PATH="${PATH}:/usr/bin:/bin"
echo "PATH = ${PATH}" >> config.mak echo "PATH = ${PATH}" >> config.mak
fi fi
cat src/Distributions/beos.mak >> distro.mak cat src/Distributions/beos.mak >> distro.mak
;; ;;
*mingw32*) *mingw32*)
echo "HAVE_WIN32 = 1" >> config.mak echo "HAVE_WIN32 = 1" >> config.mak
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
EXTRA_CFLAGS="-O3" EXTRA_CFLAGS="-O3"
cat src/Distributions/win32.mak >> distro.mak cat src/Distributions/win32.mak >> distro.mak
;; ;;
i686-pc-cygwin) i686-pc-cygwin)
echo "HAVE_WIN32 = 1" >> config.mak echo "HAVE_WIN32 = 1" >> config.mak
echo "HAVE_CYGWIN = 1" >> config.mak echo "HAVE_CYGWIN = 1" >> config.mak
CC="gcc -mno-cygwin -isystem /usr/include/mingw" CC="gcc -mno-cygwin -isystem /usr/include/mingw"
CXX="g++ -mno-cygwin -isystem /usr/include/mingw" CXX="g++ -mno-cygwin -isystem /usr/include/mingw"
HOST=`$CC -dumpmachine` HOST=`$CC -dumpmachine`
EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw" EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw" EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
EXTRA_LDFLAGS=" -mno-cygwin" EXTRA_LDFLAGS=" -mno-cygwin"
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
cat src/Distributions/win32.mak >> distro.mak cat src/Distributions/win32.mak >> distro.mak
;; ;;
arm-wince-pe) arm-wince-pe)
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
EXTRA_CPPFLAGS=" -D_WIN32_WCE" EXTRA_CPPFLAGS=" -D_WIN32_WCE"
cat src/Distributions/wince.mak >> distro.mak cat src/Distributions/wince.mak >> distro.mak
;; ;;
armeb-linux-uclibc) armeb-linux-uclibc)
echo "HAVE_UCLIBC = 1" >> config.mak echo "HAVE_UCLIBC = 1" >> config.mak
echo "HAVE_BIGENDIAN = 1" >> config.mak echo "HAVE_BIGENDIAN = 1" >> config.mak
EXTRA_CFLAGS="-Os -march=armv5 -msoft-float" EXTRA_CFLAGS="-Os -march=armv5 -msoft-float"
if test ! -z "${DISTRO}"; then
cat src/Distributions/${DISTRO}.mak >> distro.mak
else
cat src/Distributions/unix.mak >> distro.mak
fi
;;
*)
if test "$HOST" = "$BUILD"; then
if test -d "/usr/lib/pkgconfig"; then
if test -z "$PKG_CONFIG_PATH"; then
echo "PKG_CONFIG_PATH = /usr/lib/pkgconfig" >> config.mak
fi
if test -z "$PKG_CONFIG_LIBDIR"; then
echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
fi
fi
# Try to match distribution
if test -f /etc/fedora-release; then
cat src/Distributions/fedora.mak >> distro.mak
else
# Default Unix-like systems
cat src/Distributions/unix.mak >> distro.mak
fi
else # unknown distro
if test ! -z "${DISTRO}"; then if test ! -z "${DISTRO}"; then
cat src/Distributions/${DISTRO}.mak >> distro.mak cat src/Distributions/${DISTRO}.mak >> distro.mak
else else
cat src/Distributions/unix.mak >> distro.mak cat src/Distributions/unix.mak >> distro.mak
fi fi
;; fi
*) ;;
if test "$HOST" = "$BUILD"; then
if test -d "/usr/lib/pkgconfig"; then
if test -z "$PKG_CONFIG_PATH"; then
echo "PKG_CONFIG_PATH = /usr/lib/pkgconfig" >> config.mak
fi
if test -z "$PKG_CONFIG_LIBDIR"; then
echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
fi
fi
# Try to match distribution
if test -f /etc/fedora-release; then
cat src/Distributions/fedora.mak >> distro.mak
else
# Default Unix-like systems
cat src/Distributions/unix.mak >> distro.mak
fi
else # unknown distro
if test ! -z "${DISTRO}"; then
cat src/Distributions/${DISTRO}.mak >> distro.mak
else
cat src/Distributions/unix.mak >> distro.mak
fi
fi
;;
esac esac
echo "BUILD = $BUILD" >> config.mak echo "BUILD = $BUILD" >> config.mak
...@@ -279,15 +279,15 @@ else ...@@ -279,15 +279,15 @@ else
fi fi
if test -f /sw/bin/svn; then if test -f /sw/bin/svn; then
echo "SVN = /sw/bin/svn" >> config.mak echo "SVN = /sw/bin/svn" >> config.mak
elif test -f /usr/local/bin/svn; then elif test -f /usr/local/bin/svn; then
echo "SVN = /usr/local/bin/svn" >> config.mak echo "SVN = /usr/local/bin/svn" >> config.mak
elif test -f /usr/bin/svn; then elif test -f /usr/bin/svn; then
echo "SVN = /usr/bin/svn" >> config.mak echo "SVN = /usr/bin/svn" >> config.mak
elif test -f /opt/local/bin/svn; then elif test -f /opt/local/bin/svn; then
echo "SVN = /opt/local/bin/svn" >> config.mak echo "SVN = /opt/local/bin/svn" >> config.mak
elif svn help >/dev/null 2>&1; then elif svn help >/dev/null 2>&1; then
echo "SVN = `which svn`" >> config.mak echo "SVN = `which svn`" >> config.mak
else else
echo "You do not have a subversion client installed." >&2 echo "You do not have a subversion client installed." >&2
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment