diff --git a/Makefile b/Makefile
index c7fdf35..f99676e 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,8 @@
 PREFIX		?= arm-none-eabi
 #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.
 ifneq ($(V),1)
 Q := @
diff --git a/examples/lm3s/Makefile.include b/examples/lm3s/Makefile.include
index c698f0c..a4fc808 100644
--- a/examples/lm3s/Makefile.include
+++ b/examples/lm3s/Makefile.include
@@ -25,8 +25,8 @@ LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 
-TOOLCHAIN_DIR ?= ../../../..
-ifeq ($(wildcard ../../../../lib/libopencm3_lm3s.a),)
+TOOLCHAIN_DIR ?= ../../../../libopencm3
+ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lm3s.a),)
 ifneq ($(strip $(shell which $(CC))),)
 TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 endif
diff --git a/examples/lm4f/Makefile.include b/examples/lm4f/Makefile.include
index 91511ce..6287d75 100644
--- a/examples/lm4f/Makefile.include
+++ b/examples/lm4f/Makefile.include
@@ -25,8 +25,8 @@ LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 
-TOOLCHAIN_DIR ?= ../../../..
-ifeq ($(wildcard ../../../../lib/libopencm3_lm4f.a),)
+TOOLCHAIN_DIR ?= ../../../../libopencm3
+ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lm4f.a),)
 ifneq ($(strip $(shell which $(CC))),)
 TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 endif
diff --git a/examples/lpc13xx/Makefile.include b/examples/lpc13xx/Makefile.include
index 049382f..4245810 100644
--- a/examples/lpc13xx/Makefile.include
+++ b/examples/lpc13xx/Makefile.include
@@ -25,8 +25,8 @@ LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 
-TOOLCHAIN_DIR ?= ../../../..
-ifeq ($(wildcard ../../../../lib/libopencm3_lpc13xx.a),)
+TOOLCHAIN_DIR ?= ../../../../libopencm3
+ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lpc13xx.a),)
 ifneq ($(strip $(shell which $(CC))),)
 TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 endif
diff --git a/examples/lpc17xx/Makefile.include b/examples/lpc17xx/Makefile.include
index 0a29041..7a6ef8d 100644
--- a/examples/lpc17xx/Makefile.include
+++ b/examples/lpc17xx/Makefile.include
@@ -25,8 +25,8 @@ LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 
-TOOLCHAIN_DIR ?= ../../../..
-ifeq ($(wildcard ../../../../lib/libopencm3_lpc17xx.a),)
+TOOLCHAIN_DIR ?= ../../../../libopencm3
+ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lpc17xx.a),)
 ifneq ($(strip $(shell which $(CC))),)
 TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 endif
diff --git a/examples/lpc43xx/Makefile.include b/examples/lpc43xx/Makefile.include
index 10121a9..1ebd47d 100644
--- a/examples/lpc43xx/Makefile.include
+++ b/examples/lpc43xx/Makefile.include
@@ -28,8 +28,8 @@ OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 GDB		= $(PREFIX)-gdb
 
-TOOLCHAIN_DIR ?= ../../../..
-ifeq ($(wildcard ../../../../lib/libopencm3_lpc43xx.a),)
+TOOLCHAIN_DIR ?= ../../../../libopencm3
+ifeq ($(wildcard ../../../../libopencm3/lib/libopencm3_lpc43xx.a),)
 ifneq ($(strip $(shell which $(CC))),)
 TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 endif
diff --git a/examples/stm32/f1/Makefile.include b/examples/stm32/f1/Makefile.include
index faf7899..0560dff 100644
--- a/examples/stm32/f1/Makefile.include
+++ b/examples/stm32/f1/Makefile.include
@@ -26,8 +26,8 @@ OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 GDB		= $(PREFIX)-gdb
 
-TOOLCHAIN_DIR ?= ../../../../..
-ifeq ($(wildcard ../../../../../lib/libopencm3_stm32f1.a),)
+TOOLCHAIN_DIR ?= ../../../../../libopencm3
+ifeq ($(wildcard ../../../../../libopencm3/lib/libopencm3_stm32f1.a),)
 ifneq ($(strip $(shell which $(CC))),)
 TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 endif
diff --git a/examples/stm32/f2/Makefile.include b/examples/stm32/f2/Makefile.include
index e8fea09..8a03552 100644
--- a/examples/stm32/f2/Makefile.include
+++ b/examples/stm32/f2/Makefile.include
@@ -27,8 +27,8 @@ OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 GDB		= $(PREFIX)-gdb
 
-TOOLCHAIN_DIR ?= ../../../../..
-ifeq ($(wildcard ../../../../../lib/libopencm3_stm32f2.a),)
+TOOLCHAIN_DIR ?= ../../../../../libopencm3
+ifeq ($(wildcard ../../../../../libopencm3/lib/libopencm3_stm32f2.a),)
 ifneq ($(strip $(shell which $(CC))),)
 TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 endif
diff --git a/examples/stm32/f4/Makefile.include b/examples/stm32/f4/Makefile.include
index ede4288..fc43e9a 100644
--- a/examples/stm32/f4/Makefile.include
+++ b/examples/stm32/f4/Makefile.include
@@ -28,8 +28,8 @@ OBJDUMP		= $(PREFIX)-objdump
 GDB		= $(PREFIX)-gdb
 FLASH		= $(shell which st-flash)
 
-TOOLCHAIN_DIR ?= ../../../../..
-ifeq ($(wildcard ../../../../../lib/libopencm3_stm32f4.a),)
+TOOLCHAIN_DIR ?= ../../../../../libopencm3
+ifeq ($(wildcard ../../../../../libopencm3/lib/libopencm3_stm32f4.a),)
 ifneq ($(strip $(shell which $(CC))),)
 TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 endif
diff --git a/examples/stm32/l1/Makefile.include b/examples/stm32/l1/Makefile.include
index e65cdb5..e259010 100644
--- a/examples/stm32/l1/Makefile.include
+++ b/examples/stm32/l1/Makefile.include
@@ -26,8 +26,8 @@ OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 GDB		= $(PREFIX)-gdb
 
-TOOLCHAIN_DIR ?= ../../../../..
-ifeq ($(wildcard ../../../../../lib/libopencm3_stm32l1.a),)
+TOOLCHAIN_DIR ?= ../../../../../libopencm3
+ifeq ($(wildcard ../../../../../libopencm3/lib/libopencm3_stm32l1.a),)
 ifneq ($(strip $(shell which $(CC))),)
 TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 endif