aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-08-25 19:53:15 -0700
committerPiotr Esden-Tempski2012-08-25 19:53:15 -0700
commit11727f56c97fb3d007e0d08e59294b6791067bd1 (patch)
treeb8beb285c0f6d8fb0a676a89c973168f5103eb01
parentd98dab6ae22baa8587fb451ff98d15361cad26cd (diff)
Minor build system fixes.
-rw-r--r--examples/stm32/f2/Makefile.include2
-rw-r--r--examples/stm32/f4/Makefile.include2
-rw-r--r--lib/Makefile.include2
3 files changed, 4 insertions, 2 deletions
diff --git a/examples/stm32/f2/Makefile.include b/examples/stm32/f2/Makefile.include
index 33130be..3e338af 100644
--- 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)
diff --git a/examples/stm32/f4/Makefile.include b/examples/stm32/f4/Makefile.include
index 31ede74..b5f0fac 100644
--- 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)
diff --git a/lib/Makefile.include b/lib/Makefile.include
index 1f071e0..f2f1f7b 100644
--- 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