Browse Source

[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 <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 14 years ago
parent
commit
f00c3c619a
1 changed files with 9 additions and 9 deletions
  1. 9
    9
      src/Makefile.housekeeping

+ 9
- 9
src/Makefile.housekeeping View File

382
 #
382
 #
383
 FNREC_STATE	:= $(BIN)/.fnrec.state
383
 FNREC_STATE	:= $(BIN)/.fnrec.state
384
 ifeq ($(wildcard $(FNREC_STATE)),)
384
 ifeq ($(wildcard $(FNREC_STATE)),)
385
-FNREC_STATE_OLD := <invalid>
385
+FNREC_OLD	:= <invalid>
386
 else
386
 else
387
-FNREC_STATE_OLD	:= $(shell cat $(FNREC_STATE))
387
+FNREC_OLD	:= $(shell cat $(FNREC_STATE))
388
 endif
388
 endif
389
-ifeq ($(FNREC_STATE_OLD),$(FNREC))
389
+ifeq ($(FNREC_OLD),$(FNREC))
390
 $(FNREC_STATE) :
390
 $(FNREC_STATE) :
391
 else
391
 else
392
 $(FNREC_STATE) : clean
392
 $(FNREC_STATE) : clean
521
 #
521
 #
522
 EMBEDDED_LIST	:= $(BIN)/.embedded.list
522
 EMBEDDED_LIST	:= $(BIN)/.embedded.list
523
 ifeq ($(wildcard $(EMBEDDED_LIST)),)
523
 ifeq ($(wildcard $(EMBEDDED_LIST)),)
524
-EMBEDDED_LIST_IMAGE := <invalid>
524
+EMBEDDED_IMAGE_OLD := <invalid>
525
 else
525
 else
526
-EMBEDDED_LIST_IMAGE := $(shell cat $(EMBEDDED_LIST))
526
+EMBEDDED_IMAGE_OLD := $(shell cat $(EMBEDDED_LIST))
527
 endif
527
 endif
528
-ifneq ($(EMBEDDED_LIST_IMAGE),$(EMBEDDED_IMAGE))
528
+ifneq ($(EMBEDDED_IMAGE_OLD),$(EMBEDDED_IMAGE))
529
 $(shell $(ECHO) "$(EMBEDDED_IMAGE)" > $(EMBEDDED_LIST))
529
 $(shell $(ECHO) "$(EMBEDDED_IMAGE)" > $(EMBEDDED_LIST))
530
 endif
530
 endif
531
 
531
 
665
 #
665
 #
666
 BLIB_LIST	:= $(BIN)/.blib.list
666
 BLIB_LIST	:= $(BIN)/.blib.list
667
 ifeq ($(wildcard $(BLIB_LIST)),)
667
 ifeq ($(wildcard $(BLIB_LIST)),)
668
-BLIB_LIST_OBJS	:= <invalid>
668
+BLIB_OBJS_OLD	:= <invalid>
669
 else
669
 else
670
-BLIB_LIST_OBJS	:= $(shell cat $(BLIB_LIST))
670
+BLIB_OBJS_OLD	:= $(shell cat $(BLIB_LIST))
671
 endif
671
 endif
672
-ifneq ($(BLIB_LIST_OBJS),$(BLIB_OBJS))
672
+ifneq ($(BLIB_OBJS_OLD),$(BLIB_OBJS))
673
 $(shell $(ECHO) "$(BLIB_OBJS)" > $(BLIB_LIST))
673
 $(shell $(ECHO) "$(BLIB_OBJS)" > $(BLIB_LIST))
674
 endif
674
 endif
675
 
675
 

Loading…
Cancel
Save