From 655970b7c0b6dc904caab04022e78e210f23294f Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Sun, 13 Aug 2017 05:58:55 +0000
Subject: Adding travis-ci support for g++-4.9 and g++-6 on Linux. Tests pass.

---
 Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 18b8441..1983148 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,12 @@ BIN_DIR  = ./bin
 
 SRC_DIR  = ./src
 
-CPP = g++
+ifdef CXX
+  CPP = $(CXX)
+  CC = $(CXX)
+else
+  CPP = g++
+endif
 
 ifdef DEBUG
   # development mode
@@ -97,7 +102,6 @@ else
   CPPFLAGS += -static
 endif
 
-
 # all
 OBJS = $(SOURCES:.cpp=.o)
 
@@ -124,7 +128,7 @@ check: fast-check slow-check
 
 clean:
 	rm -rf ${SRC_DIR}/*.o ${SRC_DIR}/*~ *~ $(OUTPUT)
-	rm test/output/*
+	rm -f test/output/*
 
 DIST_COMMON = COPYING.txt README.txt Makefile
 DIST_SUBDIRS = src doc example bin
-- 
cgit 1.4.1