From 7c630141d4f481705061b210b81c2ec861f2fdb7 Mon Sep 17 00:00:00 2001
From: Saleem Rashid <trezor@saleemrashid.com>
Date: Mon, 11 Dec 2017 19:42:51 +0000
Subject: [PATCH] Makefile.include: Use LDLIBS & LIBDEPS

---
 Makefile.include | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index d01ccbdda..14d16a325 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -82,13 +82,18 @@ LDFLAGS  += --static \
             -Wl,--end-group \
             -L$(TOP_DIR) \
             -L$(TOOLCHAIN_DIR)/lib \
-            -L$(TOOLCHAIN_DIR)/lib/stm32/f2 \
             -T$(LDSCRIPT) \
             -nostartfiles \
             -Wl,--gc-sections \
             $(CPUFLAGS) \
             $(FPUFLAGS)
 
+LDLIBS   += -ltrezor
+LIBDEPS  += $(TOP_DIR)/libtrezor.a
+
+LDLIBS   += -lopencm3_stm32f2
+LIBDEPS  += $(TOOLCHAIN_DIR)/lib/libopencm3_stm32f2.a
+
 all: $(NAME).bin
 
 flash: $(NAME).bin
@@ -127,8 +132,8 @@ $(NAME).srec: $(NAME).elf
 $(NAME).list: $(NAME).elf
 	$(OBJDUMP) -S $(NAME).elf > $(NAME).list
 
-$(NAME).elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32f2.a $(TOP_DIR)/libtrezor.a
-	$(LD) -o $(NAME).elf $(OBJS) -ltrezor -lopencm3_stm32f2 $(LDFLAGS)
+$(NAME).elf: $(OBJS) $(LDSCRIPT) $(LIBDEPS)
+	$(LD) -o $(NAME).elf $(OBJS) $(LDLIBS) $(LDFLAGS)
 
 %.o: %.s Makefile
 	$(AS) $(CPUFLAGS) -o $@ $<