[M] Change in coreboot[main]: amdfwtool: Use Makefile.mk for Makefile settings

[Felix Singer (Code Review)]

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80715?usp=email )

Change subject: amdfwtool: Use Makefile.mk for Makefile settings
......................................................................

amdfwtool: Use Makefile.mk for Makefile settings

When updating the Makefiles, to keep from having to update two files at
the same time, import Makefile.mk into the external Makefile. This
allows the bulk of the settings to be in a single location.

While I'm here, I adjusted the print statements to match the rest of
coreboot.

Change-Id: Id5b869f49b34b22e6a02fc086e7b42975141a87e
Signed-off-by: Martin Roth 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80715
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Singer 
---
M util/amdfwtool/Makefile
M util/amdfwtool/Makefile.mk
2 files changed, 23 insertions(+), 33 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Singer: Looks good to me, approved

diff --git a/util/amdfwtool/Makefile b/util/amdfwtool/Makefile
index 9392f02..b45178d 100644
--- a/util/amdfwtool/Makefile
+++ b/util/amdfwtool/Makefile
@@ -7,41 +7,24 @@
 HOSTCC ?= cc
 endif

-READ_SRC = amdfwread.c
-READ_OBJ = $(READ_SRC:%.c=%.o)
-TOOL_SRC = amdfwtool.c data_parse.c signed_psp.c handle_file.c
-TOOL_OBJ = $(TOOL_SRC:%.c=%.o)
-HEADER=amdfwtool.h
 TARGETS = amdfwread amdfwtool
-WERROR=-Werror
-CFLAGS :=-O2 -Wall -Wextra -Wshadow ${WERROR}
-CFLAGS += -I $(top)/src/commonlib/bsd/include
-CFLAGS += -D_GNU_SOURCE # memmem() from string.h
-
-ifneq ($(PKG_CONFIG),)
-HOSTPKGCONFIG ?= $(PKG_CONFIG)
-else
-HOSTPKGCONFIG ?= pkg-config
-endif
-CFLAGS += $(shell $(HOSTPKGCONFIG) --cflags libcrypto)
-ifneq ($(.SHELLSTATUS),0)
-$(error "Ensure that pkg-config is installed.")
-endif
-LDFLAGS += $(shell $(HOSTPKGCONFIG) --libs libcrypto)

all: $(TARGETS)

-amdfwread: $(READ_OBJ)
-	$(HOSTCC) $(READ_OBJ) $(LDFLAGS) -o $@
+BUILD_ALL_TOOLS = 1
+include ./Makefile.mk

-amdfwtool: $(TOOL_OBJ)
-	$(HOSTCC) $(TOOL_OBJ) $(LDFLAGS) -o $@
+amdfwread: $(amdfwreadobj)
+	$(HOSTCC) $(amdfwreadobj) $(LDFLAGS) -o $@

-%.o: %.c $(HEADER)
-	$(HOSTCC) $(CFLAGS) -c -o $@ $<
+amdfwtool: $(amdfwtoolobj)
+	$(HOSTCC) $(amdfwtoolobj) $(LDFLAGS) -o $@
+
+%.o: %.c $(amdfwheader)
+	$(HOSTCC) $(AMDFWTOOLCFLAGS) -c -o $@ $<

clean:
-	@rm -f $(TARGETS) $(READ_OBJ) $(TOOL_OBJ)
+	@rm -f $(TARGETS) $(amdfwreadobj) $(amdfwtoolobj)

distclean: clean

diff --git a/util/amdfwtool/Makefile.mk b/util/amdfwtool/Makefile.mk
index d0b01ac..8198fe3 100644
--- a/util/amdfwtool/Makefile.mk
+++ b/util/amdfwtool/Makefile.mk
@@ -4,12 +4,18 @@

amdfwtoolobj = amdfwtool.o data_parse.o signed_psp.o handle_file.o
 amdfwreadobj = amdfwread.o
+amdfwheader = amdfwtool.h

-AMDFWTOOLCFLAGS :=-O2 -Wall -Wextra -Wshadow -Werror
+WERROR ?= -Werror
+AMDFWTOOLCFLAGS :=-O2 -Wall -Wextra -Wshadow $(WERROR)
 AMDFWTOOLCFLAGS += -I $(top)/src/commonlib/bsd/include
 AMDFWTOOLCFLAGS += -D_GNU_SOURCE # memmem() from string.h

+ifneq ($(PKG_CONFIG),)
+HOSTPKGCONFIG ?= $(PKG_CONFIG)
+else
 HOSTPKGCONFIG ?= pkg-config
+endif

AMDFWTOOLCFLAGS += $(shell $(HOSTPKGCONFIG) --cflags libcrypto)
 ifneq ($(.SHELLSTATUS),0)
@@ -17,15 +23,16 @@
 endif
 LDFLAGS += $(shell $(HOSTPKGCONFIG) --libs libcrypto)

-$(objutil)/amdfwtool/%.o: $(top)/util/amdfwtool/%.c # $(HEADER)
+$(objutil)/amdfwtool/%.o: $(top)/util/amdfwtool/%.c $(dir)/$(amdfwheader)
+	printf "    AMDFW      $@\n"
    $(HOSTCC) $(AMDFWTOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $<

-$(objutil)/amdfwtool/amdfwtool: $(addprefix $(objutil)/amdfwtool/,$(amdfwtoolobj))
-	printf "   AMDFWTOOL\n"
+$(objutil)/amdfwtool/amdfwtool: $(addprefix $(objutil)/amdfwtool/,$(amdfwtoolobj)) $(dir)/$(amdfwheader)
+	printf "    AMDFWTOOL  $@\n"
    $(HOSTCC) $(addprefix $(objutil)/amdfwtool/,$(amdfwtoolobj)) $(LDFLAGS) -o $@

-$(objutil)/amdfwtool/amdfwread: $(addprefix $(objutil)/amdfwtool/,$(amdfwreadobj))
-	printf "   AMDFWREAD\n"
+$(objutil)/amdfwtool/amdfwread: $(addprefix $(objutil)/amdfwtool/,$(amdfwreadobj)) $(dir)/$(amdfwheader)
+	printf "    AMDFWREAD  $@\n"
    $(HOSTCC) $(addprefix $(objutil)/amdfwtool/,$(amdfwreadobj)) $(LDFLAGS) -o $@

endif # ifneq ($(BUILD_ALL_TOOLS)$(CONFIG_USE_AMDFWTOOL),)