GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Makefiles: Rename top-level Makefiles from .inc to .mk

Browse source 
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.

The rest of the Makefiles will be renamed in following commits.

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: Idaf69c6871d0bc1ee5e2e53157b8631c55eb3db9
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80063
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Martin Roth 2024-01-18 10:25:18 -07:00 committed by Felix Singer
parent 792ed6353a
commit e3df18451c
10 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Makefile
View file

@ -50,7 +50,7 @@ rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
SYMLINK_LIST = $(call rwildcard,site-local/,symlink.txt) SYMLINK_LIST = $(call rwildcard,site-local/,symlink.txt)
# directory containing the toplevel Makefile.inc # Directory containing the toplevel Makefile.mk
TOPLEVEL := . TOPLEVEL := .
CONFIG_SHELL := sh CONFIG_SHELL := sh
@ -102,7 +102,7 @@ help_coreboot help::
# This include must come _before_ the pattern rules below! # This include must come _before_ the pattern rules below!
# Order _does_ matter for pattern rules. # Order _does_ matter for pattern rules.
include $(srck)/Makefile.inc include $(srck)/Makefile.mk
# The cases where we don't need fully populated $(obj) lists: # The cases where we don't need fully populated $(obj) lists:
# 1. when no .config exists # 1. when no .config exists
@ -153,11 +153,12 @@ ifeq ($(NOCOMPILE),1)
HOSTCC ?= $(if $(shell type gcc 2>/dev/null),gcc,cc) HOSTCC ?= $(if $(shell type gcc 2>/dev/null),gcc,cc)
HOSTCXX ?= g++ HOSTCXX ?= g++
include $(TOPLEVEL)/Makefile.inc include $(TOPLEVEL)/Makefile.mk
include $(TOPLEVEL)/payloads/Makefile.inc include $(TOPLEVEL)/payloads/Makefile.mk
include $(TOPLEVEL)/util/testing/Makefile.inc include $(TOPLEVEL)/util/testing/Makefile.mk
-include $(TOPLEVEL)/site-local/Makefile.mk
-include $(TOPLEVEL)/site-local/Makefile.inc -include $(TOPLEVEL)/site-local/Makefile.inc
include $(TOPLEVEL)/tests/Makefile.inc include $(TOPLEVEL)/tests/Makefile.mk
printall real-all: printall real-all:
@echo "Error: Trying to build, but NOCOMPILE is set." >&2 @echo "Error: Trying to build, but NOCOMPILE is set." >&2
@echo " Please file a bug with the following information:" @echo " Please file a bug with the following information:"
@ -198,7 +199,7 @@ endif
export LANG LC_ALL TZ SOURCE_DATE_EPOCH export LANG LC_ALL TZ SOURCE_DATE_EPOCH
ifneq ($(UNIT_TEST),1) ifneq ($(UNIT_TEST),1)
include toolchain.inc include toolchain.mk
endif endif
strip_quotes = $(strip $(subst ",,$(subst \",,$(1)))) strip_quotes = $(strip $(subst ",,$(subst \",,$(1))))
@ -276,7 +277,7 @@ src-to-ali=\
$(subst .$(1),,\ $(subst .$(1),,\
$(filter %.ads %.adb,$(2))))))))) $(filter %.ads %.adb,$(2)))))))))
# Clean -y variables, include Makefile.inc # Clean -y variables, include Makefile.mk & Makefile.inc
# Add paths to files in X-y to X-srcs # Add paths to files in X-y to X-srcs
# Add subdirs-y to subdirs # Add subdirs-y to subdirs
includemakefiles= \ includemakefiles= \
@ -295,9 +296,12 @@ includemakefiles= \
# For each path in $(subdirs) call includemakefiles # For each path in $(subdirs) call includemakefiles
# Repeat until subdirs is empty # Repeat until subdirs is empty
# TODO: Remove Makefile.inc support
evaluate_subdirs= \ evaluate_subdirs= \
$(eval cursubdirs:=$(subdirs)) \ $(eval cursubdirs:=$(subdirs)) \
$(eval subdirs:=) \ $(eval subdirs:=) \
$(foreach dir,$(cursubdirs), \
$(eval $(call includemakefiles,$(dir)/Makefile.mk))) \
$(foreach dir,$(cursubdirs), \ $(foreach dir,$(cursubdirs), \
$(eval $(call includemakefiles,$(dir)/Makefile.inc))) \ $(eval $(call includemakefiles,$(dir)/Makefile.inc))) \
$(if $(subdirs),$(eval $(call evaluate_subdirs))) $(if $(subdirs),$(eval $(call evaluate_subdirs)))
@ -306,11 +310,11 @@ evaluate_subdirs= \
subdirs:=$(TOPLEVEL) subdirs:=$(TOPLEVEL)
postinclude-hooks := postinclude-hooks :=
# Don't iterate through Makefile.incs under src/ when building tests # Don't iterate through Makefiles under src/ when building tests
ifneq ($(UNIT_TEST),1) ifneq ($(UNIT_TEST),1)
$(eval $(call evaluate_subdirs)) $(eval $(call evaluate_subdirs))
else else
include $(TOPLEVEL)/tests/Makefile.inc include $(TOPLEVEL)/tests/Makefile.mk
endif endif
ifeq ($(FAILBUILD),1) ifeq ($(FAILBUILD),1)

2
Makefile.inc → Makefile.mk
View file

@ -1158,7 +1158,7 @@ FMAP_CBFS_SIZE := $(call int-subtract,$(FMAP_BIOS_SIZE) $(FMAP_CBFS_BASE))
endif # ifeq ($(CONFIG_ARCH_X86),y) endif # ifeq ($(CONFIG_ARCH_X86),y)
$(obj)/fmap.fmd: $(top)/Makefile.inc $(DEFAULT_FLASHMAP) $(obj)/config.h $(obj)/fmap.fmd: $(top)/Makefile.mk $(DEFAULT_FLASHMAP) $(obj)/config.h
sed -e "s,##ROM_BASE##,$(FMAP_ROM_ADDR)," \ sed -e "s,##ROM_BASE##,$(FMAP_ROM_ADDR)," \
-e "s,##ROM_SIZE##,$(FMAP_ROM_SIZE)," \ -e "s,##ROM_SIZE##,$(FMAP_ROM_SIZE)," \
-e "s,##BIOS_BASE##,$(FMAP_BIOS_BASE)," \ -e "s,##BIOS_BASE##,$(FMAP_BIOS_BASE)," \

0
payloads/Makefile.inc → payloads/Makefile.mk
View file

2
payloads/coreinfo/Makefile
View file

@ -70,7 +70,7 @@ $(obj)/config.h:
$(shell mkdir -p $(objk)/lxdialog $(KCONFIG_SPLITCONFIG)) $(shell mkdir -p $(objk)/lxdialog $(KCONFIG_SPLITCONFIG))
include $(srck)/Makefile.inc include $(srck)/Makefile.mk
.PHONY: $(PHONY) prepare all real-all defaultbuild .PHONY: $(PHONY) prepare all real-all defaultbuild

4
payloads/libpayload/Makefile
View file

@ -103,7 +103,7 @@ endif
# This include must come _before_ the pattern rules below! # This include must come _before_ the pattern rules below!
# Order _does_ matter for pattern rules. # Order _does_ matter for pattern rules.
include $(srck)/Makefile.inc include $(srck)/Makefile.mk
include $(HAVE_DOTCONFIG) include $(HAVE_DOTCONFIG)
@ -127,7 +127,7 @@ ARCH-$(CONFIG_LP_ARCH_MOCK) := mock
# 3. when make distclean is run # 3. when make distclean is run
# 4. when make help% or make clean% is run # 4. when make help% or make clean% is run
# 5. when make %-test or make %-tests or make %coverage-report is run # 5. when make %-test or make %-tests or make %coverage-report is run
# Don't waste time on reading all Makefile.incs in these cases # Don't waste time on reading all Makefiles in these cases
ifeq ($(strip $(HAVE_DOTCONFIG)),) ifeq ($(strip $(HAVE_DOTCONFIG)),)
NOCOMPILE := 1 NOCOMPILE := 1
endif endif

0
tests/Makefile.inc → tests/Makefile.mk
View file

0
toolchain.inc → toolchain.mk
View file

0
util/kconfig/Makefile.inc → util/kconfig/Makefile.mk
View file

2
util/lint/kconfig_lint
View file

@ -36,7 +36,7 @@ my $exclude_dirs_and_files =
'^build/\|^coreboot-builds/\|^configs/\|^util/\|^\.git/\|^payloads\|^Documentation\|^3rdparty' '^build/\|^coreboot-builds/\|^configs/\|^util/\|^\.git/\|^payloads\|^Documentation\|^3rdparty'
. '\|' . # directories to exclude when searching for used symbols . '\|' . # directories to exclude when searching for used symbols
'\.config\|\.txt$\|\.tex$\|\.tags\|/kconfig.h\|\.fmd'; #files to exclude when looking for symbols '\.config\|\.txt$\|\.tex$\|\.tags\|/kconfig.h\|\.fmd'; #files to exclude when looking for symbols
my $payload_files_to_check='payloads/Makefile.inc payloads/external/Makefile.inc'; my $payload_files_to_check='payloads/Makefile.mk payloads/external/Makefile.inc';
my $config_file = ""; # name of config file to load symbol values from. my $config_file = ""; # name of config file to load symbol values from.
my @wholeconfig; # document the entire kconfig structure my @wholeconfig; # document the entire kconfig structure
my %loaded_files; # list of each Kconfig file loaded my %loaded_files; # list of each Kconfig file loaded

0
util/testing/Makefile.inc → util/testing/Makefile.mk
View file