summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDerick Huth <derickhuth@gmail.com>2014-11-21 13:40:28 -0700
committerDerick Huth <derickhuth@gmail.com>2014-11-21 13:40:28 -0700
commit0bd379bd2d620e90f6ce35f874a5a7f7f3ec82c7 (patch)
treebedc5be7d1bdb8d32c1868caa496a8a1530d8d8a /Makefile
parent8d73c8fcc75556c1df71dd39dd99783f8f86fc3e (diff)
parenteb9236c5353785472ae132f27e1cfb9f1e4264a5 (diff)
downloadchill-0bd379bd2d620e90f6ce35f874a5a7f7f3ec82c7.tar.gz
chill-0bd379bd2d620e90f6ce35f874a5a7f7f3ec82c7.tar.bz2
chill-0bd379bd2d620e90f6ce35f874a5a7f7f3ec82c7.zip
Merge pull request #3 from dhuth/master
Updating Makefile and test coverage.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 14fe22c..7f2c8b5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
CC = g++
CFLAGS = -g -Wno-write-strings
DEPENDENCE_CFLAGS = -M
-OMEGAHOME = ./omega
+OMEGAHOME=./omega
ifdef TEST_COVERAGE
CFLAGS := $(CFLAGS) -fprofile-arcs -ftest-coverage
@@ -154,7 +154,11 @@ CHILL_OBJS = $(CHILL_SRCS:.cc=.o)
CUDACHILL_OBJS = $(CUDACHILL_SRCS:.cc=.o)
-all: cuda-chill chill
+all:
+ $(MAKE) depend-chill
+ $(MAKE) chill
+ $(MAKE) depend-cuda-chill
+ $(MAKE) cuda-chill
# can't these be combined to a superset of all source files?