Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions make/stanc
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ endif
# bin/stanc build rules - requires stan, stan_math submodules in place
ifeq ($(CMDSTAN_SUBMODULES),1)
ifneq ($(STANC3),)
# build stanc3 from local installation
bin/stanc$(EXE) : $(shell find $(STANC3)/src/ -type f -name '*.ml*') $(STANC#)
# build stanc3 from local installation
bin/stanc$(EXE) : $(call findfiles,$(STANC3)/src/,*.ml*) $(STANC#)
@mkdir -p $(dir $@)
cd $(STANC3) && echo "--- Rebuilding stanc ---\n" && dune build @install
cp $(STANC3)/_build/default/src/stanc/stanc.exe $@
Expand Down Expand Up @@ -90,7 +90,7 @@ bin/stanc2$(EXE) : bin/cmdstan/stanc.o


# libstanc build rules
STANC_TEMPLATE_INSTANTIATION_CPP := $(shell find $(STAN)src/stan/lang -type f -name '*_inst.cpp') $(shell find $(STAN)src/stan/lang -type f -name '*_def.cpp')
STANC_TEMPLATE_INSTANTIATION_CPP := $(call findfiles,$(STAN)src/stan/lang,*_inst.cpp) $(call findfiles,$(STAN)src/stan/lang,*_def.cpp)
STANC_TEMPLATE_INSTANTIATION := $(STANC_TEMPLATE_INSTANTIATION_CPP:$(STAN)src/stan/%.cpp=bin/cmdstan/%.o)

bin/cmdstan/libstanc.a : $(STANC_TEMPLATE_INSTANTIATION)
Expand Down
2 changes: 1 addition & 1 deletion make/tests
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ endif
# Target to verify header files within CmdStan has
# enough include calls
##
HEADER_TESTS := $(addsuffix -test,$(shell find src/cmdstan -name '*.hpp' -type f))
HEADER_TESTS := $(addsuffix -test,$(call findfiles,src/cmdstan,*.hpp))

ifeq ($(OS),Windows_NT)
DEV_NULL = nul
Expand Down
6 changes: 3 additions & 3 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ clean: clean-manual

clean-deps:
@echo ' removing dependency files'
$(shell find src $(STAN)src/stan $(MATH)stan -type f -name '*.d' -exec rm {} +)
$(shell find src $(STAN)src/stan $(MATH)stan -type f -name '*.d.*' -exec rm {} +)
$(shell find src $(STAN)src/stan $(MATH)stan -type f -name '*.dSYM' -exec rm {} +)
$(RM) $(call findfiles,src,*.d) $(call findfiles,src/stan,*.d) $(call findfiles,$(MATH)/stan,*.d)
$(RM) $(call findfiles,src,*.d.*) $(call findfiles,src/stan,*.d.*) $(call findfiles,$(MATH)/stan,*.d.*)
$(RM) $(call findfiles,src,*.dSYM) $(call findfiles,src/stan,*.dSYM) $(call findfiles,$(MATH)/stan,*.dSYM)

Comment thread
rok-cesnovar marked this conversation as resolved.
clean-manual:
$(RM) -r doc
Expand Down