Attempting to use a different variable name

idaholab · May 2, 2019 · a6388e5 · a6388e5
1 parent 5956d92
commit a6388e5
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 35 deletions.
diff --git a/framework/app.mk b/framework/app.mk
@@ -264,8 +264,8 @@ LIBRARY_SUFFIX :=
 $(eval $(call CXX_RULE_TEMPLATE,_with$(app_LIB_SUFFIX)))
 
 # If this is a matching module then build the exec, otherwise fall back and use the variable
-ifneq (, $(SAVED_APPLICATION_NAME))
-  ifeq ($(SAVED_APPLICATION_NAME),$(APPLICATION_NAME))
+ifneq (,$(MODULE_NAME))
+  ifeq ($(MODULE_NAME),$(APPLICATION_NAME))
     all:: $(app_EXEC)
   else
     all:: $(app_LIB)
@@ -298,7 +298,7 @@ $(app_LIB): curr_dir  := $(APPLICATION_DIR)
 $(app_LIB): curr_deps := $(depend_libs)
 $(app_LIB): curr_libs := $(depend_libs_flags)
 $(app_LIB): $(app_HEADER) $(app_plugin_deps) $(depend_libs) $(app_objects) $(ADDITIONAL_DEPEND_LIBS)
-	@echo "SAVED_APPLICATION_NAME: " $(SAVED_APPLICATION_NAME)
+	@echo "MODULE_NAME: " $(MODULE_NAME)
 	@echo "APPLICATION_NAME: " $(APPLICATION_NAME)
 	@echo "SKIP_LOADER: " $(SKIP_LOADER)
 	@echo "Linking Library "$@"..."

diff --git a/modules/chemical_reactions/Makefile b/modules/chemical_reactions/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := chemical_reactions
+MODULE_NAME := chemical_reactions
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/contact/Makefile b/modules/contact/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := contact
+MODULE_NAME := contact
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/external_petsc_solver/Makefile b/modules/external_petsc_solver/Makefile
@@ -18,7 +18,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := external_petsc_solver
+MODULE_NAME := external_petsc_solver
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/fluid_properties/Makefile b/modules/fluid_properties/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := fluid_properties
+MODULE_NAME := fluid_properties
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/functional_expansion_tools/Makefile b/modules/functional_expansion_tools/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := functional_expansion_tools
+MODULE_NAME := functional_expansion_tools
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/heat_conduction/Makefile b/modules/heat_conduction/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := heat_conduction
+MODULE_NAME := heat_conduction
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/level_set/Makefile b/modules/level_set/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := level_set
+MODULE_NAME := level_set
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/misc/Makefile b/modules/misc/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := misc
+MODULE_NAME := misc
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/modules.mk b/modules/modules.mk
@@ -1,19 +1,16 @@
-###############################################################################
-############################ COMMON MODULES ###################################
-###############################################################################
+################################################################################
+############################ COMMON MODULES ####################################
+################################################################################
 
-# When building an individual module, you should define APPLICATION_NAME to the
-# module you want to build before including this file. When doing that, there
-# is no need to duplicate the dependencies in the individual module's Makefile.
-# However, since APPLICATION_NAME gets redefined several times if multiple
-# modules are being built we need to save it off to keep track when we need
-# to build the exec for it or not.
+# When building an individual module, you should define MODULE_NAME (lower case)
+# to the module you want to build before including this file. When doing that,
+# there is no need to duplicate the dependencies in the individual module's
+# Makefile.
 
-SAVED_APPLICATION_NAME := $(APPLICATION_NAME)
-ifneq (, $(SAVED_APPLICATION_NAME))
-  # Exec will automatically be built for the given APPLICATION_NAME
+ifneq (,$(MODULE_NAME))
+  # Exec will automatically be built for the given MODULE_NAME
   SKIP_LOADER := yes
-  UC_APP = $(shell echo $(SAVED_APPLICATION_NAME) | tr a-z A-Z)
+  UC_APP = $(shell echo $(MODULE_NAME) | tr a-z A-Z)
   $(eval $(UC_APP):=yes)
 endif
 
@@ -65,8 +62,8 @@ endif
 # The master list of all moose modules
 MODULE_NAMES := "chemical_reactions contact fluid_properties functional_expansion_tools heat_conduction level_set misc navier_stokes phase_field porous_flow rdg richards solid_mechanics stochastic_tools tensor_mechanics xfem external_petsc_solver"
 
-###############################################################################
-########################## MODULE REGISTRATION ################################
+################################################################################
+########################## MODULE REGISTRATION #################################
 ###############################################################################
 GEN_REVISION  := no
 

diff --git a/modules/navier_stokes/Makefile b/modules/navier_stokes/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := navier_stokes
+MODULE_NAME := navier_stokes
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/phase_field/Makefile b/modules/phase_field/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := phase_field
+MODULE_NAME := phase_field
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/porous_flow/Makefile b/modules/porous_flow/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := porous_flow
+MODULE_NAME := porous_flow
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/rdg/Makefile b/modules/rdg/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := rdg
+MODULE_NAME := rdg
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/richards/Makefile b/modules/richards/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := richards
+MODULE_NAME := richards
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/solid_mechanics/Makefile b/modules/solid_mechanics/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := solid_mechanics
+MODULE_NAME := solid_mechanics
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/stochastic_tools/Makefile b/modules/stochastic_tools/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := stochastic_tools
+MODULE_NAME := stochastic_tools
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/tensor_mechanics/Makefile b/modules/tensor_mechanics/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := tensor_mechanics
+MODULE_NAME := tensor_mechanics
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################

diff --git a/modules/xfem/Makefile b/modules/xfem/Makefile
@@ -19,7 +19,7 @@ include $(FRAMEWORK_DIR)/build.mk
 include $(FRAMEWORK_DIR)/moose.mk
 
 # Module
-APPLICATION_NAME := xfem
+MODULE_NAME := xfem
 include $(MODULE_DIR)/modules.mk
 
 ###############################################################################