From f00c3c619a33a0fef6b42bdc0559b23470f19ba0 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 14 Jul 2010 17:43:44 +0100 Subject: [build] Standardise variable naming for inter-build state files For files such as $(BIN)/.blib.list, standardise the variable names used to represent the file contents. Signed-off-by: Michael Brown --- src/Makefile.housekeeping | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/Makefile.housekeeping') diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index 2b244e22..159fed81 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -382,11 +382,11 @@ endif # FNREC_STATE := $(BIN)/.fnrec.state ifeq ($(wildcard $(FNREC_STATE)),) -FNREC_STATE_OLD := +FNREC_OLD := else -FNREC_STATE_OLD := $(shell cat $(FNREC_STATE)) +FNREC_OLD := $(shell cat $(FNREC_STATE)) endif -ifeq ($(FNREC_STATE_OLD),$(FNREC)) +ifeq ($(FNREC_OLD),$(FNREC)) $(FNREC_STATE) : else $(FNREC_STATE) : clean @@ -521,11 +521,11 @@ roms : # EMBEDDED_LIST := $(BIN)/.embedded.list ifeq ($(wildcard $(EMBEDDED_LIST)),) -EMBEDDED_LIST_IMAGE := +EMBEDDED_IMAGE_OLD := else -EMBEDDED_LIST_IMAGE := $(shell cat $(EMBEDDED_LIST)) +EMBEDDED_IMAGE_OLD := $(shell cat $(EMBEDDED_LIST)) endif -ifneq ($(EMBEDDED_LIST_IMAGE),$(EMBEDDED_IMAGE)) +ifneq ($(EMBEDDED_IMAGE_OLD),$(EMBEDDED_IMAGE)) $(shell $(ECHO) "$(EMBEDDED_IMAGE)" > $(EMBEDDED_LIST)) endif @@ -665,11 +665,11 @@ $(BIN)/%.info : # BLIB_LIST := $(BIN)/.blib.list ifeq ($(wildcard $(BLIB_LIST)),) -BLIB_LIST_OBJS := +BLIB_OBJS_OLD := else -BLIB_LIST_OBJS := $(shell cat $(BLIB_LIST)) +BLIB_OBJS_OLD := $(shell cat $(BLIB_LIST)) endif -ifneq ($(BLIB_LIST_OBJS),$(BLIB_OBJS)) +ifneq ($(BLIB_OBJS_OLD),$(BLIB_OBJS)) $(shell $(ECHO) "$(BLIB_OBJS)" > $(BLIB_LIST)) endif -- cgit v1.2.3-55-g7522