diff options
| author | Peter Carbonetto | 2017-08-13 20:24:36 -0500 |
|---|---|---|
| committer | GitHub | 2017-08-13 20:24:36 -0500 |
| commit | 3763f477e17a74942e1bf545aa9493d39bf9448e (patch) | |
| tree | 5cba2d3232ac3352d75932301bf335f8a4aebc04 /Makefile | |
| parent | a8e39eb0df1cc3889cb702cf4a88f674a4d12d15 (diff) | |
| parent | 655970b7c0b6dc904caab04022e78e210f23294f (diff) | |
| download | pangemma-3763f477e17a74942e1bf545aa9493d39bf9448e.tar.gz | |
Merge pull request #67 from genenetwork/travis
Travis.
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 |