Attention is currently required from: Felix Singer, Julius Werner, Stefan Reinauer.
Martin L Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80123?usp=email )
Change subject: util: Rename Makefiles from .inc to .mak ......................................................................
util: Rename Makefiles from .inc to .mak
The .inc suffix is confusing to various tools as it's not specific to Makefiles. This means that editors don't recognize the files, and don't open them with highlighting and any other specific editor functionality.
This issue is also seen in the release notes generation script where Makefiles get renamed before running cloc.
Signed-off-by: Martin Roth gaumless@gmail.com Change-Id: I434940ebb46853980596f7ad55d27a62c90280fa --- M Makefile.mak R util/amdfwtool/Makefile.mak R util/bincfg/Makefile.mak M util/cbfstool/Makefile R util/cbfstool/Makefile.mak R util/cbfstool/bpdt_formats/Makefile.mak R util/cbfstool/fpt_formats/Makefile.mak R util/crossgcc/Makefile.mak M util/futility/Makefile R util/futility/Makefile.mak M util/ifdtool/Makefile R util/ifdtool/Makefile.mak R util/marvell/Makefile.mak R util/marvell/doimage_mv/Makefile.mak R util/nvidia/Makefile.mak R util/nvramtool/Makefile.mak R util/qemu/Makefile.mak R util/sconfig/Makefile.mak R util/supermicro/Makefile.mak 19 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/80123/1
diff --git a/Makefile.mak b/Makefile.mak index de2598c..386c633 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -768,7 +768,7 @@ install-git-commit-clangfmt: cp util/scripts/prepare-commit-msg.clang-format .git/hooks/prepare-commit-msg
-include util/crossgcc/Makefile.inc +include util/crossgcc/Makefile.mak
.PHONY: tools tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo $(CSE_FPT) $(CSE_SERGER) $(AMDFWREAD) diff --git a/util/amdfwtool/Makefile.inc b/util/amdfwtool/Makefile.mak similarity index 100% rename from util/amdfwtool/Makefile.inc rename to util/amdfwtool/Makefile.mak diff --git a/util/bincfg/Makefile.inc b/util/bincfg/Makefile.mak similarity index 100% rename from util/bincfg/Makefile.inc rename to util/bincfg/Makefile.mak diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 034aca2..0b13693 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -91,7 +91,7 @@ .SILENT: endif
-include Makefile.inc +include Makefile.mak
$(objutil)/cbfstool/cbfstool.o: $(VBOOT_SOURCE)/firmware/include/vb2_sha.h $(objutil)/cbfstool/elogtool.o: $(VBOOT_SOURCE)/firmware/include/vb2_sha.h diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.mak similarity index 98% rename from util/cbfstool/Makefile.inc rename to util/cbfstool/Makefile.mak index 80aab67..783ea95 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.mak @@ -98,14 +98,14 @@ elogobj += common.o elogobj += flashrom.o
-include $(top)/util/cbfstool/fpt_formats/Makefile.inc +include $(top)/util/cbfstool/fpt_formats/Makefile.mak cse_fpt_obj := cse_fpt_obj += cse_fpt.o cse_fpt_obj += common.o cse_fpt_obj += cse_helpers.o cse_fpt_obj += $(foreach var, $(fpt_formats_obj), $(var))
-include $(top)/util/cbfstool/bpdt_formats/Makefile.inc +include $(top)/util/cbfstool/bpdt_formats/Makefile.mak cse_serger_obj := cse_serger_obj += cse_serger.o cse_serger_obj += common.o diff --git a/util/cbfstool/bpdt_formats/Makefile.inc b/util/cbfstool/bpdt_formats/Makefile.mak similarity index 100% rename from util/cbfstool/bpdt_formats/Makefile.inc rename to util/cbfstool/bpdt_formats/Makefile.mak diff --git a/util/cbfstool/fpt_formats/Makefile.inc b/util/cbfstool/fpt_formats/Makefile.mak similarity index 100% rename from util/cbfstool/fpt_formats/Makefile.inc rename to util/cbfstool/fpt_formats/Makefile.mak diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.mak similarity index 100% rename from util/crossgcc/Makefile.inc rename to util/crossgcc/Makefile.mak diff --git a/util/futility/Makefile b/util/futility/Makefile index 6901948..200b423 100644 --- a/util/futility/Makefile +++ b/util/futility/Makefile @@ -23,4 +23,4 @@ endif endif
-include Makefile.inc +include Makefile.mak diff --git a/util/futility/Makefile.inc b/util/futility/Makefile.mak similarity index 100% rename from util/futility/Makefile.inc rename to util/futility/Makefile.mak diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile index c021069..cb01966 100644 --- a/util/ifdtool/Makefile +++ b/util/ifdtool/Makefile @@ -10,7 +10,7 @@ HOSTCFLAGS ?= $(CFLAGS) top := ../.. objutil := .. -include Makefile.inc +include Makefile.mak
PROGRAM=$(objutil)/ifdtool/ifdtool
diff --git a/util/ifdtool/Makefile.inc b/util/ifdtool/Makefile.mak similarity index 100% rename from util/ifdtool/Makefile.inc rename to util/ifdtool/Makefile.mak diff --git a/util/marvell/Makefile.inc b/util/marvell/Makefile.mak similarity index 100% rename from util/marvell/Makefile.inc rename to util/marvell/Makefile.mak diff --git a/util/marvell/doimage_mv/Makefile.inc b/util/marvell/doimage_mv/Makefile.mak similarity index 100% rename from util/marvell/doimage_mv/Makefile.inc rename to util/marvell/doimage_mv/Makefile.mak diff --git a/util/nvidia/Makefile.inc b/util/nvidia/Makefile.mak similarity index 100% rename from util/nvidia/Makefile.inc rename to util/nvidia/Makefile.mak diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.mak similarity index 100% rename from util/nvramtool/Makefile.inc rename to util/nvramtool/Makefile.mak diff --git a/util/qemu/Makefile.inc b/util/qemu/Makefile.mak similarity index 93% rename from util/qemu/Makefile.inc rename to util/qemu/Makefile.mak index e1181ad..ff82b09 100644 --- a/util/qemu/Makefile.inc +++ b/util/qemu/Makefile.mak @@ -2,10 +2,10 @@
# This automatically adds a `qemu` make target if a compatible # configuration is selected. There are some notable variables -# that can be set or adapted in `Makefile.inc` files, the make +# that can be set or adapted in `Makefile.mak` files, the make # command line or the environment: # -# Primarily for `Makefile.inc` use: +# Primarily for `Makefile.mak` use: # QEMU-y the QEMU executable # QEMU_CFG-y a QEMU config that sets the available default devices, # used to run more comprehensive tests by default, diff --git a/util/sconfig/Makefile.inc b/util/sconfig/Makefile.mak similarity index 100% rename from util/sconfig/Makefile.inc rename to util/sconfig/Makefile.mak diff --git a/util/supermicro/Makefile.inc b/util/supermicro/Makefile.mak similarity index 100% rename from util/supermicro/Makefile.inc rename to util/supermicro/Makefile.mak