From e3bb7ffd257526b19d8b82d8a5b8dac688718b59 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@esi-group.com> Date: Mon, 28 May 2018 10:46:40 +0200 Subject: [PATCH] STYLE: avoid mix of 'sinclude' and '-include' in make files --- wmake/makefiles/files | 2 +- wmake/makefiles/general | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wmake/makefiles/files b/wmake/makefiles/files index e28c353d4ba..4c32b2f26e8 100644 --- a/wmake/makefiles/files +++ b/wmake/makefiles/files @@ -31,7 +31,7 @@ FILES = $(OBJECTS_DIR)/files VARS = $(OBJECTS_DIR)/variables SFILES = $(OBJECTS_DIR)/sourceFiles --include $(OPTIONS) +sinclude $(OPTIONS) #------------------------------------------------------------------------------ diff --git a/wmake/makefiles/general b/wmake/makefiles/general index 4973e148914..5d0bc95d748 100644 --- a/wmake/makefiles/general +++ b/wmake/makefiles/general @@ -212,7 +212,7 @@ dep: $(DEPENDENCIES) updatedep: dep ifeq ($(findstring lnInclude,$(MAKECMDGOALS))$(findstring updatedep,$(MAKECMDGOALS)),) --include $(DEPENDENCIES) +sinclude $(DEPENDENCIES) endif -- GitLab