diff options
| author | dhuth <derickhuth@gmail.com> | 2014-11-21 13:35:20 -0700 |
|---|---|---|
| committer | dhuth <derickhuth@gmail.com> | 2014-11-21 13:35:20 -0700 |
| commit | a1834b22c43c282442b0cb164767e6c877cf0e5b (patch) | |
| tree | bedc5be7d1bdb8d32c1868caa496a8a1530d8d8a /Makefile | |
| parent | ded84bb4aec7461738e7b7033d782a518e2c606b (diff) | |
| parent | eb9236c5353785472ae132f27e1cfb9f1e4264a5 (diff) | |
| download | chill-a1834b22c43c282442b0cb164767e6c877cf0e5b.tar.gz chill-a1834b22c43c282442b0cb164767e6c877cf0e5b.tar.bz2 chill-a1834b22c43c282442b0cb164767e6c877cf0e5b.zip | |
Merge branch 'master' into doe
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -6,7 +6,7 @@ CC = g++ CFLAGS = -g -Wno-write-strings DEPENDENCE_CFLAGS = -M -#OMEGAHOME = $(HOME)/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? |