build: do not install modules on a normal build

Author: VincentVanlaer

Makefile

@@ -17,6 +17,6 @@ include $(MAKE_DIR)/subdir-deps.mk
 clean:
 	@rm -rf $(BUILD_DIR_)
 
-all: $(SUBDIRS) $(addsuffix -install,$(SUBDIRS)) $(addsuffix -check,$(SUBDIRS))
+all: $(SUBDIRS) $(addsuffix -extract-data,$(SUBDIRS)) $(addsuffix -check,$(SUBDIRS))
 
-.PHONY: all $(SUBDIRS) $(addsuffix -install,$(SUBDIRS)) $(addsuffix -check,$(SUBDIRS)) clean install
+.PHONY: all $(SUBDIRS) $(addsuffix -extract-data,$(SUBDIRS)) $(addsuffix -check,$(SUBDIRS)) $(addsuffix -install,$(SUBDIRS)) clean install

atm/Makefile

@@ -25,7 +25,7 @@ CHECK_RESULTS_GOLDEN := test/test_output
 
 MODULES := atm_def.mod atm_lib.mod
 INSTALL_INCLUDES :=
-INSTALL_COMMANDS += install-atm-data
+EXTRACT_DATA_COMMANDS += install-atm-data
 
 include $(MAKE_DIR)/Makefile
 

chem/Makefile

@@ -21,7 +21,7 @@ CHECK_RESULTS_GOLDEN := test/test_output
 
 MODULES := chem_def.mod chem_lib.mod
 INSTALL_INCLUDES :=
-INSTALL_COMMANDS += install-chem-data
+EXTRACT_DATA_COMMANDS += install-chem-data
 
 include $(MAKE_DIR)/Makefile
 

colors/Makefile

@@ -19,7 +19,7 @@ CHECK_RESULTS_GOLDEN := test/test_output
 
 MODULES := colors_def.mod colors_lib.mod
 INSTALL_INCLUDES :=
-INSTALL_COMMANDS += install-colors-data
+EXTRACT_DATA_COMMANDS += install-colors-data
 
 include $(MAKE_DIR)/Makefile
 

eos/Makefile

@@ -50,7 +50,7 @@ CHECK_RESULTS_GOLDEN := test/test_output
 
 MODULES := eos_def.mod eos_lib.mod
 INSTALL_INCLUDES := public/helm_def.dek
-INSTALL_COMMANDS += install-free-eos install-cms install-dt install-pc
+EXTRACT_DATA_COMMANDS += install-free-eos install-cms install-dt install-pc
 
 include $(MAKE_DIR)/Makefile
 

install

@@ -270,17 +270,6 @@ if [ ! -z "$MESASDK_ROOT" ]; then
     fi
 fi
 
-
-if [ ! -r lib ]
-then
-  mkdir lib
-fi
-
-if [ ! -r include ]
-then
-  mkdir include
-fi
-
 function enum_procs {
     if [ -n "$NPROCS" ]; then
 	echo $NPROCS

ionization/Makefile

@@ -22,7 +22,7 @@ CHECK_RESULTS_GOLDEN := test/test_output
 
 MODULES := ionization_def.mod ionization_lib.mod
 INSTALL_INCLUDES :=
-INSTALL_COMMANDS += install-ionization-data
+EXTRACT_DATA_COMMANDS += install-ionization-data
 
 include $(MAKE_DIR)/Makefile
 

kap/Makefile

@@ -44,7 +44,7 @@ CHECK_RESULTS_GOLDEN := test/test_output
 # Install
 
 MODULES := kap_def.mod kap_lib.mod
-INSTALL_COMMANDS += install-kap
+EXTRACT_DATA_COMMANDS += install-kap
 
 include $(MAKE_DIR)/Makefile
 

make/Makefile

@@ -6,11 +6,12 @@ MAKEFLAGS += --no-builtin-variables
 .DELETE_ON_ERROR:
 .SHELLFLAGS := -eu -c
 .DEFAULT_GOAL := all
-.PHONY: clean print-mesa-deps install all check
+.PHONY: clean print-mesa-deps install all check extract-data
 
 NOCOMPILE := $(or \
   $(filter clean,$(MAKECMDGOALS)), \
   $(filter print-mesa-deps,$(MAKECMDGOALS)), \
+  $(filter extract-data,$(MAKECMDGOALS)), \
 )
 
 include $(MAKE_DIR)/helpers.mk
@@ -54,6 +55,8 @@ ifeq ($(NOCOMPILE),)
   include $(MAKE_DIR)/check.mk
 endif
 
+extract-data: $(EXTRACT_DATA_COMMANDS)
+
 clean:
 	@rm -rf $(BUILD_DIR_MODULE)
 

make/gen-folder-deps

@@ -14,7 +14,10 @@ ${subdir}: ${DEPS} data/version_number
 ${subdir}-install: ${subdir}
 	\$(MAKE) -C ${subdir} install BUILD_DIR=\$(BUILD_DIR)
 
-${subdir}-check: ${subdir}-install \$(addsuffix -install,${DEPS})
+${subdir}-check: ${subdir} ${subdir}-extract-data \$(addsuffix -extract-data,${DEPS})
 	\$(MAKE) -C ${subdir} check BUILD_DIR=\$(BUILD_DIR)
+
+${subdir}-extract-data: ${subdir}
+	\$(MAKE) -C ${subdir} extract-data BUILD_DIR=\$(BUILD_DIR)
 EOF
 done