diff options
| -rw-r--r-- | util/amdfwtool/Makefile | 37 | ||||
| -rw-r--r-- | util/amdfwtool/Makefile.mk | 19 |
2 files changed, 23 insertions, 33 deletions
diff --git a/util/amdfwtool/Makefile b/util/amdfwtool/Makefile index 9392f02fed..b45178d535 100644 --- a/util/amdfwtool/Makefile +++ b/util/amdfwtool/Makefile @@ -7,41 +7,24 @@ else 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 + +amdfwread: $(amdfwreadobj) + $(HOSTCC) $(amdfwreadobj) $(LDFLAGS) -o $@ -amdfwtool: $(TOOL_OBJ) - $(HOSTCC) $(TOOL_OBJ) $(LDFLAGS) -o $@ +amdfwtool: $(amdfwtoolobj) + $(HOSTCC) $(amdfwtoolobj) $(LDFLAGS) -o $@ -%.o: %.c $(HEADER) - $(HOSTCC) $(CFLAGS) -c -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 d0b01ac6dc..8198fe3b6e 100644 --- a/util/amdfwtool/Makefile.mk +++ b/util/amdfwtool/Makefile.mk @@ -4,12 +4,18 @@ ifneq ($(BUILD_ALL_TOOLS)$(CONFIG_USE_AMDFWTOOL),) 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 @@ $(error "Ensure that pkg-config is installed.") 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),) |