Some minor cleanup and removal of export USR_DBFLAGS

require-ess/tools/driver.makefile

@@ -198,7 +198,6 @@ export ${PRJ}_E3_GIT_STATUS
 
 export SUBS
 export TMPS
-export USR_DBFLAGS
 
 # Some shell commands:
 RMDIR = rm -rf
@@ -467,17 +466,17 @@ install build debug:: $(COMMON_DIR)
 db_internal: $(COMMON_DIR)
 
 define SUBS_EXPAND
-vpath $(notdir $1) $(dir $1)
-$(COMMON_DIR)/$(notdir $(basename $1).db): $(notdir $1)
-	@printf "Inflating database ... %44s >>> %40s \n" "$$^" "$$@"
-	$(MSI) -D $(USR_DBFLAGS) -o $(COMMON_DIR)/$$(notdir $$(basename $1).db) $2 $$^ > $(COMMON_DIR)/$$(notdir $$(basename $1).db).d
-	$(MSI)    $(USR_DBFLAGS) -o $(COMMON_DIR)/$$(notdir $$(basename $1).db) $2 $$^
+vpath $(notdir $2) $(dir $2)
+db_internal: $(COMMON_DIR)/$(notdir $(basename $2).db)
 
-db_internal: $(COMMON_DIR)/$(notdir $(basename $1).db)
+$(COMMON_DIR)/$(notdir $(basename $2).db): $(notdir $2)
+	@printf "Inflating database ... %44s >>> %40s \n" "$$^" "$$@"
+	$(QUIET)$(MSI) -D $$(USR_DBFLAGS) -o $(COMMON_DIR)/$$(notdir $$(basename $2).db) $1 $$^ > $(COMMON_DIR)/$$(notdir $$(basename $2).db).d
+	$(QUIET)$(MSI)    $$(USR_DBFLAGS) -o $(COMMON_DIR)/$$(notdir $$(basename $2).db) $1 $$^
 endef
 
-$(foreach file,$(SUBS),$(eval $(call SUBS_EXPAND,$(file),-S)))
-$(foreach file,$(TMPS),$(eval $(call SUBS_EXPAND,$(file),)))
+$(foreach file,$(SUBS),$(eval $(call SUBS_EXPAND,-S,$(file))))
+$(foreach file,$(TMPS),$(eval $(call SUBS_EXPAND,,$(file))))
 
 else # T_A