From 3268896c20735ca9aa3c733c687ef6bbed760bcc Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Sun, 27 Aug 2017 07:56:19 +0000
Subject: Makefile: clean up of the main Makefile and changed build
 instructions           to align with normal build systems

* Debug mode is now the default (use DEBUG= to disable)
* Dynamic linking is now the default (use FORCE_STATIC=1 for static)
* Removed references to 32-bit compilation (default is $arch)
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index df74fb2..ec2d049 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,12 +35,12 @@ script:
   - eval "${MATRIX_EVAL}"
   - $CXX --version
   # build and test debug version
-  - make CXX=$CXX FORCE_DYNAMIC=1 WITH_OPENBLAS=1 DEBUG=1 -j 4
-  - time make CXX=$CXX FORCE_DYNAMIC=1 WITH_OPENBLAS=1 DEBUG=1 check
+  - make CXX=$CXX WITH_OPENBLAS=1 -j 4
+  - time make CXX=$CXX WITH_OPENBLAS=1 check
   - make clean
   # build and test release version
   - make CXX=$CXX FORCE_DYNAMIC=1 WITH_OPENBLAS=1 -j 4
-  - time make CXX=$CXX FORCE_DYNAMIC=1 WITH_OPENBLAS=1 check
+  - time make CXX=$CXX WITH_OPENBLAS=1 DEBUG= check
   # build static release (fast-check only)
   # - make clean
   # - make CXX=$CXX TRAVIS_CI=1 -j 4 fast-check
-- 
cgit v1.2.3