Fix Travis-CI build

While here, refactor a bit so that a failing libnfc build does not
indicate a failure of the libfreefare build.

.travis-ci-build

@@ -1,33 +1,22 @@
 #!/bin/sh
+cd $1
 
-build_install()
+if [ "$BLD" = autotools ]; then
-{
+	set -x
-	(
+	autoreconf -vis
-		cd $1
+	mkdir build-autotools
-		if [ "$BLD" = autotools ]; then
+	cd build-autotools
-			set -x
+	../configure --prefix=$HOME/.local
-			autoreconf -vis
+	make
-			mkdir build-autotools
+	make install
-			cd build-autotools
+elif [ "$BLD" = cmake ]; then
-			../configure --prefix=$HOME/.local
+	set -x
-			make
+	mkdir build-cmake
-			make install
+	cd build-cmake
-			set +x
+	cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local ..
-		elif [ "$BLD" = cmake ]; then
+	make
-			set -x
+	make install
-			mkdir build-cmake
+else
-			cd build-cmake
+	echo "Unsupported build system: '$BLD'" >&2
-			cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local ..
+	exit 1
-			make
+fi
-			make install
-			set +x
-		else
-			echo "Unsupported build system: '$BLD'" >&2
-			exit 1
-		fi
-	)
-}
-
-git clone https://github.com/nfc-tools/libnfc
-build_install libnfc
-build_install .

.travis.yml

@@ -6,7 +6,7 @@ compiler:
 
 env:
   - BLD=cmake
-  - BLD=autoconf
+  - BLD=autotools
 
 addons:
   apt:
@@ -15,4 +15,7 @@ addons:
       - cmake
       - libcutter-dev
 
-script: ./.travis-ci-build
+install:
+  - git clone https://github.com/nfc-tools/libnfc
+  - ./.travis-ci-build libnfc
+script: ./.travis-ci-build .