Merge pull request #1217 from stan-dev/makefile/missing-submodules-cleanup

Improve missing submodule logic

Author: WardBrian

make/command

@@ -1,4 +1,3 @@
-ifeq ($(CMDSTAN_SUBMODULES),1)
 bin/cmdstan/stansummary.o : src/cmdstan/stansummary_helper.hpp
 bin/cmdstan/%.o : src/cmdstan/%.cpp
 	@mkdir -p $(dir $@)
@@ -11,5 +10,3 @@ bin/print$(EXE) bin/stansummary$(EXE) bin/diagnose$(EXE) : LDLIBS_MPI =
 bin/print$(EXE) bin/stansummary$(EXE) bin/diagnose$(EXE) : bin/%$(EXE) : bin/cmdstan/%.o $(TBB_TARGETS)
 	@mkdir -p $(dir $@)
 	$(LINK.cpp) $^ $(LDLIBS) $(OUTPUT_OPTION)
-
-endif

make/stanc

@@ -9,7 +9,6 @@ endef
 
 # if nothing was set to $(OS) that means that the Stan Math submodule is missing
 OS ?= missing-submodules
-CMDSTAN_SUBMODULES = 1
 STANC_DL_RETRY = 5
 STANC_DL_DELAY = 10
 STANC3_TEST_BIN_URL ?=
@@ -38,14 +37,11 @@ else ifeq ($(OS),Linux)
   endif
  endif
 
-else ifeq ($(OS),missing-submodules)
- CMDSTAN_SUBMODULES = 0
 else
   $(error  Cannot detect OS properly. $n This will impede automatically downloading the correct stanc. $n Please visit https://github.com/stan-dev/stanc3/releases and download a stanc binary for your OS and place it in ./bin/stanc. $n )
 endif
 
-# bin/stanc build rules - requires stan, stan_math submodules in place
-ifeq ($(CMDSTAN_SUBMODULES),1)
+# bin/stanc build rules
 ifneq ($(STANC3),)
   # build stanc3 from local installation
   bin/stanc$(EXE) : $(call findfiles,$(STANC3)/src/,*.ml*) $(STANC#)
@@ -91,5 +87,4 @@ else
 	curl -L https://github.com/stan-dev/stanc3/releases/download/$(STANC3_VERSION)/$(OS_TAG)$(ARCH_TAG)-stanc -o bin/stanc$(EXE) --retry $(STANC_DL_RETRY) --retry-delay $(STANC_DL_DELAY)
 	chmod +x bin/stanc$(EXE)
 endif
-endif
 # end bin/stanc build rules

makefile

@@ -141,9 +141,9 @@ else
 PRECOMPILED_MODEL_HEADER=
 endif
 
--include $(MATH)make/compiler_flags
--include $(MATH)make/dependencies
--include $(MATH)make/libraries
+include $(MATH)make/compiler_flags
+include $(MATH)make/dependencies
+include $(MATH)make/libraries
 include make/stanc
 include make/program
 include make/tests
@@ -262,7 +262,6 @@ build-mpi: $(MPI_TARGETS)
 	@echo ''
 	@echo '--- boost mpi bindings built ---'
 
-ifeq ($(CMDSTAN_SUBMODULES),1)
 .PHONY: build
 build: bin/stanc$(EXE) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(CMDSTAN_MAIN_O) $(PRECOMPILED_MODEL_HEADER) bin/stansummary$(EXE) bin/print$(EXE) bin/diagnose$(EXE)
 	@echo ''
@@ -275,17 +274,6 @@ ifeq ($(OS),Windows_NT)
 		@echo 'to automatically update your user configuration.'
 endif
 	@echo '--- CmdStan v$(CMDSTAN_VERSION) built ---'
-else
-.PHONY: build
-build:
-	@echo 'ERROR: Missing Stan submodules.'
-	@echo 'Please run the following to fix:'
-	@echo ''
-	@echo 'git submodule update --init --recursive'
-	@echo ''
-	@echo 'And try building again'
-	@exit 1
-endif
 
 .PHONY: install-tbb
 install-tbb: $(TBB_TARGETS)
@@ -352,3 +340,20 @@ print-%  : ; @echo $* = $($*)
 
 .PHONY: clean-build
 clean-build: clean-all build
+
+
+##
+# This is only run if the `include` statements earlier fail to find a file.
+# We assume that means the submodule is missing
+##
+$(MATH)make/% :
+	@echo 'ERROR: Missing Stan submodules.'
+	@echo 'We tried to find the Stan Math submodule at:'
+	@echo '  $(MATH)'
+	@echo ''
+	@echo 'The most likely source of the problem is CmdStan was cloned without'
+	@echo 'the --recursive flag.  To fix this, run the following command:'
+	@echo '  git submodule update --init --recursive'
+	@echo ''
+	@echo 'And try building again'
+	@exit 1