From f845adc2448c56096f4ba64f676937d9fbdd061b Mon Sep 17 00:00:00 2001 From: Martin Roth <gaumless@gmail.com> Date: Thu, 18 Jan 2024 12:34:16 -0700 Subject: lib,console,sbom: Rename Makefiles from .inc to .mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: I9eabe84d55fd9f434e4128866810c0e4970f2ae7 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80081 Reviewed-by: Michael Niewöhner <foss@mniewoehner.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com> Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de> --- src/lib/gnat/Makefile.inc | 59 ----------------------------------------------- src/lib/gnat/Makefile.mk | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 src/lib/gnat/Makefile.inc create mode 100644 src/lib/gnat/Makefile.mk (limited to 'src/lib/gnat') diff --git a/src/lib/gnat/Makefile.inc b/src/lib/gnat/Makefile.inc deleted file mode 100644 index 150a715067..0000000000 --- a/src/lib/gnat/Makefile.inc +++ /dev/null @@ -1,59 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -define libgnat-template -# $1 arch - -additional-dirs += $$(obj)/libgnat-$(1)/adainclude -additional-dirs += $$(obj)/libgnat-$(1)/adalib - -ADAFLAGS_libgnat-$(1) := \ - --RTS=$$(obj)/libgnat-$(1)/ \ - -gnatg \ - -gnatpg \ - -I$$(src)/lib/gnat/ \ - $$(GCC_ADAFLAGS_$(1)) \ - -Werror \ - -fno-pie \ - -libgnat-$(1)-y += a-unccon.ads -libgnat-$(1)-y += ada.ads -libgnat-$(1)-y += g-souinf.ads -libgnat-$(1)-y += gnat.ads -libgnat-$(1)-y += i-c.adb -libgnat-$(1)-y += i-c.ads -libgnat-$(1)-y += interfac.ads -libgnat-$(1)-y += s-atacco.ads -libgnat-$(1)-y += s-imenne.adb -libgnat-$(1)-y += s-imenne.ads -libgnat-$(1)-y += s-maccod.ads -libgnat-$(1)-y += s-parame.ads -libgnat-$(1)-y += s-stoele.adb -libgnat-$(1)-y += s-stoele.ads -libgnat-$(1)-y += s-unstyp.ads -libgnat-$(1)-y += system.ads - -# Copy bodies too for inlining -$$(obj)/libgnat-$(1)/libgnat.a: $$$$(libgnat-$(1)-objs) - cp $$(libgnat-$(1)-srcs) $$(libgnat-$(1)-extra-specs) \ - $$(obj)/libgnat-$(1)/adainclude/ - cp $$(libgnat-$(1)-alis) \ - $$(obj)/libgnat-$(1)/adalib/ - rm -f $$@ - @printf " AR $$(subst $$(obj)/,,$$(@))\n" - $$(AR_libgnat-$(1)) cr $$@ $$^ - -endef - - -$(foreach arch,$(standard-archs), \ - $(eval $(call define_class,libgnat-$(arch),$(arch)))) - -$(foreach arch,$(standard-archs), \ - $(eval $(call libgnat-template,$(arch)))) - -ifeq ($(CONFIG_ROMSTAGE_ADA),y) -romstage-libs += $(obj)/libgnat-$(ARCH-romstage-y)/libgnat.a -endif -ifeq ($(CONFIG_RAMSTAGE_ADA),y) -ramstage-libs += $(obj)/libgnat-$(ARCH-ramstage-y)/libgnat.a -endif diff --git a/src/lib/gnat/Makefile.mk b/src/lib/gnat/Makefile.mk new file mode 100644 index 0000000000..150a715067 --- /dev/null +++ b/src/lib/gnat/Makefile.mk @@ -0,0 +1,59 @@ +## SPDX-License-Identifier: GPL-2.0-only + +define libgnat-template +# $1 arch + +additional-dirs += $$(obj)/libgnat-$(1)/adainclude +additional-dirs += $$(obj)/libgnat-$(1)/adalib + +ADAFLAGS_libgnat-$(1) := \ + --RTS=$$(obj)/libgnat-$(1)/ \ + -gnatg \ + -gnatpg \ + -I$$(src)/lib/gnat/ \ + $$(GCC_ADAFLAGS_$(1)) \ + -Werror \ + -fno-pie \ + +libgnat-$(1)-y += a-unccon.ads +libgnat-$(1)-y += ada.ads +libgnat-$(1)-y += g-souinf.ads +libgnat-$(1)-y += gnat.ads +libgnat-$(1)-y += i-c.adb +libgnat-$(1)-y += i-c.ads +libgnat-$(1)-y += interfac.ads +libgnat-$(1)-y += s-atacco.ads +libgnat-$(1)-y += s-imenne.adb +libgnat-$(1)-y += s-imenne.ads +libgnat-$(1)-y += s-maccod.ads +libgnat-$(1)-y += s-parame.ads +libgnat-$(1)-y += s-stoele.adb +libgnat-$(1)-y += s-stoele.ads +libgnat-$(1)-y += s-unstyp.ads +libgnat-$(1)-y += system.ads + +# Copy bodies too for inlining +$$(obj)/libgnat-$(1)/libgnat.a: $$$$(libgnat-$(1)-objs) + cp $$(libgnat-$(1)-srcs) $$(libgnat-$(1)-extra-specs) \ + $$(obj)/libgnat-$(1)/adainclude/ + cp $$(libgnat-$(1)-alis) \ + $$(obj)/libgnat-$(1)/adalib/ + rm -f $$@ + @printf " AR $$(subst $$(obj)/,,$$(@))\n" + $$(AR_libgnat-$(1)) cr $$@ $$^ + +endef + + +$(foreach arch,$(standard-archs), \ + $(eval $(call define_class,libgnat-$(arch),$(arch)))) + +$(foreach arch,$(standard-archs), \ + $(eval $(call libgnat-template,$(arch)))) + +ifeq ($(CONFIG_ROMSTAGE_ADA),y) +romstage-libs += $(obj)/libgnat-$(ARCH-romstage-y)/libgnat.a +endif +ifeq ($(CONFIG_RAMSTAGE_ADA),y) +ramstage-libs += $(obj)/libgnat-$(ARCH-ramstage-y)/libgnat.a +endif -- cgit v1.2.3