Project

General

Profile

« Previous | Next » 

Revision 10105

inputs/input.Makefile: keep $(sortFile) up-to-date: use sort_file_updated=1 flag to indicate that import_order.txt has already been checked, so that recursive invocations of make don't need to recheck it. also use this flag instead of an explicit $(MAKECMDGOALS) list to prevent the $(sortFile) check from being infinite-recursively reinvoked when input.Makefile is read as part of the $(sortFile) check itself.

View differences:

input.Makefile
99 99
dontImport = $(wildcard $(noImportFile))$(wildcard $(1)/$(noImportFile))$(if\
100 100
$(import_source),,$(filter Source,$(1)))
101 101

  
102
ifeq ($(filter $(sortFile) list_tables,$(MAKECMDGOALS)),)
103
$(shell $(selfMake) $(sortFile)|$(filter_make) >&2)# keep $(sortFile) up-to-date
102
ifeq ($(sort_file_updated),)# keep $(sortFile) up-to-date
103
$(shell sort_file_updated=1 $(selfMake) $(sortFile)|$(filter_make) >&2)
104
export sort_file_updated=1
104 105
endif
105 106

  
106 107
sort_file_tables := $(if $(wildcard $(sortFile)),$(shell cat $(sortFile)))

Also available in: Unified diff