EMTime/libopencm3-examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected the library search path.

Browse Source
This commit is contained in:
Piotr Esden-Tempski
2013-04-19 17:41:20 -07:00
parent 28fe596b54
commit 9237f2f99c
10 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -20,6 +20,8 @@
PREFIX ?= arm-none-eabi PREFIX ?= arm-none-eabi
#PREFIX ?= arm-elf #PREFIX ?= arm-elf
TARGETS = stm32/f1 stm32/f2 stm32/f4 stm32/l1 lpc13xx lpc17xx lpc43xx lm3s lm4f efm32/efm32tg efm32/efm32g efm32/efm32lg efm32/efm32gg
# Be silent per default, but 'make V=1' will show all compiler calls. # Be silent per default, but 'make V=1' will show all compiler calls.
ifneq ($(V),1) ifneq ($(V),1)
Q := @ Q := @

4
examples/lm3s/Makefile.include
View File

@@ -25,8 +25,8 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
TOOLCHAIN_DIR ?= ../../../.. TOOLCHAIN_DIR ?= ../../../../libopencm3
ifeq ($(wildcard ../../../../lib/libopencm3_lm3s.a),) ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lm3s.a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif

4
examples/lm4f/Makefile.include
View File

@@ -25,8 +25,8 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
TOOLCHAIN_DIR ?= ../../../.. TOOLCHAIN_DIR ?= ../../../../libopencm3
ifeq ($(wildcard ../../../../lib/libopencm3_lm4f.a),) ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lm4f.a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif

4
examples/lpc13xx/Makefile.include
View File

@@ -25,8 +25,8 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
TOOLCHAIN_DIR ?= ../../../.. TOOLCHAIN_DIR ?= ../../../../libopencm3
ifeq ($(wildcard ../../../../lib/libopencm3_lpc13xx.a),) ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lpc13xx.a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif

4
examples/lpc17xx/Makefile.include
View File

@@ -25,8 +25,8 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
TOOLCHAIN_DIR ?= ../../../.. TOOLCHAIN_DIR ?= ../../../../libopencm3
ifeq ($(wildcard ../../../../lib/libopencm3_lpc17xx.a),) ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lpc17xx.a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif

4
examples/lpc43xx/Makefile.include
View File

@@ -28,8 +28,8 @@ OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb GDB = $(PREFIX)-gdb
TOOLCHAIN_DIR ?= ../../../.. TOOLCHAIN_DIR ?= ../../../../libopencm3
ifeq ($(wildcard ../../../../lib/libopencm3_lpc43xx.a),) ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lpc43xx.a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif

4
examples/stm32/f1/Makefile.include
View File

@@ -26,8 +26,8 @@ OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb GDB = $(PREFIX)-gdb
TOOLCHAIN_DIR ?= ../../../../.. TOOLCHAIN_DIR ?= ../../../../../libopencm3
ifeq ($(wildcard ../../../../../lib/libopencm3_stm32f1.a),) ifeq ($(wildcard ../../../../../libopencm3/lib/libopencm3_stm32f1.a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif

4
examples/stm32/f2/Makefile.include
View File

@@ -27,8 +27,8 @@ OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb GDB = $(PREFIX)-gdb
TOOLCHAIN_DIR ?= ../../../../.. TOOLCHAIN_DIR ?= ../../../../../libopencm3
ifeq ($(wildcard ../../../../../lib/libopencm3_stm32f2.a),) ifeq ($(wildcard ../../../../../libopencm3/lib/libopencm3_stm32f2.a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif

4
examples/stm32/f4/Makefile.include
View File

@@ -28,8 +28,8 @@ OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb GDB = $(PREFIX)-gdb
FLASH = $(shell which st-flash) FLASH = $(shell which st-flash)
TOOLCHAIN_DIR ?= ../../../../.. TOOLCHAIN_DIR ?= ../../../../../libopencm3
ifeq ($(wildcard ../../../../../lib/libopencm3_stm32f4.a),) ifeq ($(wildcard ../../../../../libopencm3/lib/libopencm3_stm32f4.a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif

4
examples/stm32/l1/Makefile.include
View File

@@ -26,8 +26,8 @@ OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb GDB = $(PREFIX)-gdb
TOOLCHAIN_DIR ?= ../../../../.. TOOLCHAIN_DIR ?= ../../../../../libopencm3
ifeq ($(wildcard ../../../../../lib/libopencm3_stm32l1.a),) ifeq ($(wildcard ../../../../../libopencm3/lib/libopencm3_stm32l1.a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif