when a generated file is already generated, it shows up in the generated_*
variable, and also the make wildcard, so use sort, since it removes duplicates.
This commit is contained in:
parent
810f2b7155
commit
8ae194f629
@ -133,7 +133,9 @@ GENERATED_TE := $(basename $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.te.in
|
|||||||
GENERATED_IF := $(basename $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.if.in)))
|
GENERATED_IF := $(basename $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.if.in)))
|
||||||
GENERATED_FC := $(basename $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.fc.in)))
|
GENERATED_FC := $(basename $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.fc.in)))
|
||||||
|
|
||||||
DETECTED_MODS := $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.te)) $(GENERATED_TE)
|
# sort here since it removes duplicates, which can happen
|
||||||
|
# when a generated file is already generated
|
||||||
|
DETECTED_MODS := $(sort $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.te)) $(GENERATED_TE))
|
||||||
ALL_MODULES := $(filter-out $(DISABLEMOD),$(DETECTED_MODS))
|
ALL_MODULES := $(filter-out $(DISABLEMOD),$(DETECTED_MODS))
|
||||||
|
|
||||||
PRE_TE_FILES := $(addprefix $(FLASKDIR)/,security_classes initial_sids access_vectors) $(M4SUPPORT) $(POLDIR)/mls
|
PRE_TE_FILES := $(addprefix $(FLASKDIR)/,security_classes initial_sids access_vectors) $(M4SUPPORT) $(POLDIR)/mls
|
||||||
|
Loading…
Reference in New Issue
Block a user