better compiler matrix

.travis.yml

@@ -2,31 +2,53 @@ language: cpp
 
 sudo: false
 
-compiler:
+matrix:
-  - gcc
+  include:
-
+    - os: linux
-env:
+      compiler: gcc
-  - COMPILER=g++-4.9
+      addons:
-  - COMPILER=g++-5
-  - COMPILER=clang-3.6
-
-addons:
         apt:
-    sources:
+          sources: ['ubuntu-toolchain-r-test']
-    - ubuntu-toolchain-r-test
+          packages: ['g++-4.8', 'valgrind']
-    - llvm-toolchain-precise
+      env: COMPILER=g++-4.8
-    - llvm-toolchain-precise-3.6
-    - llvm-toolchain-precise-3.7
-    packages:
-    - g++-4.9
-    - g++-5
-    - clang-3.6
-    - valgrind
-    - python-pip
-    - python-yaml
 
-before_script:
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-4.9', 'valgrind', 'python-pip', 'python-yaml']
+      before_script:
         - pip install --user git+git://github.com/eddyxu/cpp-coveralls.git
+      env: COMPILER=g++-4.9
+
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-5', 'valgrind']
+      env: COMPILER=g++-5
+
+    - os: linux
+      compiler: clang
+      env: COMPILER=clang++
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5']
+          packages: ['clang-3.5', 'valgrind']
+      env: COMPILER=clang++-3.5
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
+          packages: ['clang-3.6', 'valgrind']
+      env: COMPILER=clang++-3.6
 
 script:
   - make CXX=$COMPILER CXXFLAGS="-lstdc++"

Makefile

@@ -1,3 +1,5 @@
+.PHONY: pretty clean
+
 # used programs
 RE2C = re2c
 SED = sed