Merge pull request #1187 from stan-dev/makefile/split-object-file-build

Split building of .o file from executable

.gitignore

@@ -49,5 +49,6 @@ src/docs/**/*.pdf
 output.csv
 output*.csv
 *.d
+*.o
 # gdb
 .gdb_history

make/program

@@ -51,13 +51,20 @@ endif
 
 %.d: %.hpp
 
-.PRECIOUS: %.hpp
-%$(EXE) : %.hpp $(CMDSTAN_MAIN_O) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(PRECOMPILED_MODEL_HEADER)
+ifeq ($(KEEP_OBJECT), true)
+.PRECIOUS: %.o
+endif
+
+%.o : %.hpp
 	@echo ''
-	@echo '--- Compiling, linking C++ code ---'
+	@echo '--- Compiling C++ code ---'
 	$(COMPILE.cpp) $(CXXFLAGS_PROGRAM) -x c++ -o $(subst  \,/,$*).o $(subst \,/,$<)
+
+%$(EXE) : %.o $(CMDSTAN_MAIN_O) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(PRECOMPILED_MODEL_HEADER)
+	@echo ''
+	@echo '--- Linking model ---'
 	$(LINK.cpp) $(subst \,/,$*.o) $(CMDSTAN_MAIN_O) $(LDLIBS) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(subst \,/,$(OUTPUT_OPTION))
-	$(RM) $(subst  \,/,$*).o
+
 ifeq ($(OS),Windows_NT)
 ifeq (,$(findstring tbb.dll, $(notdir $(shell where tbb.dll))))
 	@echo 'Intel TBB is not in PATH.'

make/tests

@@ -58,8 +58,8 @@ TEST_MODELS := $(wildcard src/test/test-models/*.stan)
 
 .PHONY: test-models-hpp
 test-models-hpp:
+	$(MAKE) $(patsubst %.stan,%.hpp,$(TEST_MODELS))
 	$(MAKE) $(patsubst %.stan,%$(EXE),$(TEST_MODELS))
-
 ##
 # Tests that depend on compiled models
 ##