From decf50e2eb8f4c446d6ac60512fd3522426deb2e Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Sat, 19 Feb 2022 17:47:14 +0100 Subject: Makefile: use libflashrom.a as input to build the flashrom executable Change-Id: Ib0091a23611cd5a1d915e56c6d0f061d74198e88 Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/62198 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Nico Huber --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 37eaf7c1..f2bcd6a7 100644 --- a/Makefile +++ b/Makefile @@ -905,8 +905,8 @@ override LDFLAGS += -lrt endif endif -LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) -OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS) +OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) + all: config $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 ifeq ($(ARCH), x86) @@ -973,10 +973,10 @@ config: %.o: %.c config $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_FLAGS) $(SCMDEF) -o $@ -c $< -$(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) +$(PROGRAM)$(EXEC_SUFFIX): $(CLI_OBJS) libflashrom.a + $(CC) -o $@ $^ $(LDFLAGS) -libflashrom.a: $(LIBFLASHROM_OBJS) +libflashrom.a: $(OBJS) $(AR) rcs $@ $^ $(RANLIB) $@ -- cgit v1.2.3