Minor build system fixes.

12 years ago · 11727f56c9
3 changed files with 4 additions and 2 deletions
--- a/examples/stm32/f2/Makefile.include
+++ b/examples/stm32/f2/Makefile.include
@ -86,7 +86,7 @@ flash: $(BINARY).flash
 	@#printf "  OBJDUMP $(*).list\n"
 	$(Q)$(OBJDUMP) -S $(*).elf > $(*).list

-%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32/f2/libopencm3_stm32f2.a
+%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32f2.a
 	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32f2 $(LDFLAGS)

--- a/examples/stm32/f4/Makefile.include
+++ b/examples/stm32/f4/Makefile.include
@ -86,7 +86,7 @@ flash: $(BINARY).flash
 	@#printf "  OBJDUMP $(*).list\n"
 	$(Q)$(OBJDUMP) -S $(*).elf > $(*).list

-%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32/f4/libopencm3_stm32f4.a
+%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32f4.a
 	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32f4 $(LDFLAGS)

--- a/lib/Makefile.include
+++ b/lib/Makefile.include
@ -32,6 +32,7 @@ $(SRCLIBDIR)/$(LIBNAME).a: $(SRCLIBDIR)/$(LIBNAME).ld $(OBJS)
 $(SRCLIBDIR)/$(LIBNAME).ld: $(LIBNAME).ld
 	@printf "  CP      $(LIBNAME).ld\n"
 	$(Q)cp $^ $@
+	$(Q)if [ -f $(LIBNAME)_rom_to_ram.ld ]; then cp $(LIBNAME)_rom_to_ram.ld $(SRCLIBDIR); fi

 %.o: %.c
 	@printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
@ -42,6 +43,7 @@ clean:
 	$(Q)rm -f *.o *.d
 	$(Q)rm -f $(SRCLIBDIR)/$(LIBNAME).a
 	$(Q)rm -f $(SRCLIBDIR)/$(LIBNAME).ld
+	$(Q)rm -f $(SRCLIBDIR)/$(LIBNAME)_rom_to_ram.ld

 .PHONY: clean