diff options
| author | Pjotr Prins | 2017-08-13 05:58:55 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2017-08-13 08:11:05 +0000 |
| commit | 655970b7c0b6dc904caab04022e78e210f23294f (patch) | |
| tree | 5cba2d3232ac3352d75932301bf335f8a4aebc04 /Makefile | |
| parent | cfcd91563e90e0492d93ab273e72fe73a97af94f (diff) | |
| download | pangemma-655970b7c0b6dc904caab04022e78e210f23294f.tar.gz | |
Adding travis-ci support for g++-4.9 and g++-6 on Linux. Tests pass.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
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 |