summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhuth <derickhuth@gmail.com>2014-10-28 11:40:26 -0600
committerdhuth <derickhuth@gmail.com>2014-10-28 11:40:26 -0600
commit6f09c776ab009ca7bb3af4ad3ef37939b8561b1c (patch)
treed7f82d0e2862282768a79c10f5d5b4d38658008e
parentc41fd9cb5f47695077165fb769e1754f7886517e (diff)
downloadchill-6f09c776ab009ca7bb3af4ad3ef37939b8561b1c.tar.gz
chill-6f09c776ab009ca7bb3af4ad3ef37939b8561b1c.tar.bz2
chill-6f09c776ab009ca7bb3af4ad3ef37939b8561b1c.zip
make all now makes chill and cuda-chill
-rw-r--r--.gitmodules0
-rw-r--r--Makefile8
2 files changed, 6 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
--- a/.gitmodules
+++ /dev/null
diff --git a/Makefile b/Makefile
index 5b091df..200e61a 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?