Skip to content

Commit 7d51923

Browse files
committedDec 15, 2015
Updating makefile
1 parent 89b1cb2 commit 7d51923

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed
 

‎make/tests

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ test/gtest.o: $(GTEST)/src/gtest-all.cc
4949
@mkdir -p test
5050
$(COMPILE.c) -O$O $(CFLAGS_GTEST) $< $(OUTPUT_OPTION)
5151

52-
test/%.o : src/test/%.cpp $(LIBGTEST)
52+
test/%.o : src/test/%.cpp
5353
@mkdir -p $(dir $@)
5454
$(COMPILE.c) -O$O $(CFLAGS_GTEST) $< $(OUTPUT_OPTION)
5555

@@ -67,9 +67,9 @@ ALL_TESTS = $(shell find src/test -type f -name '*_test.cpp')
6767
ALL_TEST_EXECUTABLES = $(patsubst src/%.cpp,%$(EXE),$(ALL_TESTS))
6868

6969
.PRECIOUS: test/%.o
70-
test/%$(EXE) : test/%.o
70+
test/%$(EXE) : test/%.o $(LIBGTEST) $(LIBCVODE)
7171
@mkdir -p $(dir $@)
72-
$(LINK.c) -O$O $(GTEST_MAIN) $< $(CFLAGS_GTEST) $(OUTPUT_OPTION) $(LIBGTEST) $(LDLIBS)
72+
$(LINK.c) -O$O $(GTEST_MAIN) $< $(CFLAGS_GTEST) $(OUTPUT_OPTION) $(LIBGTEST) $(LDLIBS) $(LIBCVODE)
7373
ifeq ($(strip $(findstring src/test/,$(MAKECMDGOALS))), )
7474
$(WINE) $@ --gtest_output="xml:$(basename $@).xml"
7575
endif

‎makefile

-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ STAN ?= stan/
2828
MATH ?= $(STAN)lib/stan_math/
2929
-include $(MATH)make/libraries
3030

31-
.PHONY: tmp
32-
tmp:
33-
@echo $(CVODE)
34-
@echo $(LIBCVODE)
35-
@echo $(SUNDIALS_CVODE)
36-
3731
##
3832
# Set default compiler options.
3933
##

0 commit comments

Comments
 (0)
Please sign in to comment.