aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-08-14 17:44:54 -0700
committerPiotr Esden-Tempski2012-08-14 17:48:23 -0700
commitfa5d689f785a4c8553acaa404f8544fd7f8f624f (patch)
treef5384f23ab26776bd673978719dcfc2220cfc9bb
parentb82e7eee52f72200b9f4a615c299056c4e09e071 (diff)
Use make wildcard command for source dir detect. Library path fix.
Thanks ni!
-rw-r--r--examples/lm3s/Makefile.include2
-rw-r--r--examples/lpc13xx/Makefile.include2
-rw-r--r--examples/lpc17xx/Makefile.include2
-rw-r--r--examples/lpc43xx/Makefile.include2
-rw-r--r--examples/stm32/f1/Makefile.include2
-rw-r--r--examples/stm32/f2/Makefile.include2
-rw-r--r--examples/stm32/f4/Makefile.include2
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/lm3s/Makefile.include b/examples/lm3s/Makefile.include
index 4d774be..0e18bd6 100644
--- a/examples/lm3s/Makefile.include
+++ b/examples/lm3s/Makefile.include
@@ -24,7 +24,7 @@ CC = $(PREFIX)-gcc
LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
-ifeq ($(shell ls ../../../../../lib/libopencm3_lm3s.a 2>/dev/null),)
+ifeq ($(wildcard ../../../../lib/libopencm3_lm3s.a),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
else
ifeq ($(V),1)
diff --git a/examples/lpc13xx/Makefile.include b/examples/lpc13xx/Makefile.include
index afd0524..cc668f8 100644
--- a/examples/lpc13xx/Makefile.include
+++ b/examples/lpc13xx/Makefile.include
@@ -24,7 +24,7 @@ CC = $(PREFIX)-gcc
LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
-ifeq ($(shell ls ../../../../../lib/libopencm3_lpc13xx.a 2>/dev/null),)
+ifeq ($(wildcard ../../../../lib/libopencm3_lpc13xx.a),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
else
ifeq ($(V),1)
diff --git a/examples/lpc17xx/Makefile.include b/examples/lpc17xx/Makefile.include
index f620a72..66688d3 100644
--- a/examples/lpc17xx/Makefile.include
+++ b/examples/lpc17xx/Makefile.include
@@ -24,7 +24,7 @@ CC = $(PREFIX)-gcc
LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
-ifeq ($(shell ls ../../../../../lib/libopencm3_lpc17xx.a 2>/dev/null),)
+ifeq ($(wildcard ../../../../lib/libopencm3_lpc17xx.a),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
else
ifeq ($(V),1)
diff --git a/examples/lpc43xx/Makefile.include b/examples/lpc43xx/Makefile.include
index b4717cd..4b1a092 100644
--- a/examples/lpc43xx/Makefile.include
+++ b/examples/lpc43xx/Makefile.include
@@ -27,7 +27,7 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb
-ifeq ($(shell ls ../../../../../lib/libopencm3_lpc43xx.a 2>/dev/null),)
+ifeq ($(wildcard ../../../../lib/libopencm3_lpc43xx.a),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
else
ifeq ($(V),1)
diff --git a/examples/stm32/f1/Makefile.include b/examples/stm32/f1/Makefile.include
index 66865b8..b315fac 100644
--- a/examples/stm32/f1/Makefile.include
+++ b/examples/stm32/f1/Makefile.include
@@ -25,7 +25,7 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb
-ifeq ($(shell ls ../../../../../lib/libopencm3_stm32f1.a 2>/dev/null),)
+ifeq ($(wildcard ../../../../../lib/libopencm3_stm32f1.a),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
else
ifeq ($(V),1)
diff --git a/examples/stm32/f2/Makefile.include b/examples/stm32/f2/Makefile.include
index 93f6ce6..33130be 100644
--- a/examples/stm32/f2/Makefile.include
+++ b/examples/stm32/f2/Makefile.include
@@ -26,7 +26,7 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb
-ifeq ($(shell ls ../../../../../lib/libopencm3_stm32f2.a 2>/dev/null),)
+ifeq ($(wildcard ../../../../../lib/libopencm3_stm32f2.a),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
else
ifeq ($(V),1)
diff --git a/examples/stm32/f4/Makefile.include b/examples/stm32/f4/Makefile.include
index 2e915ce..31ede74 100644
--- a/examples/stm32/f4/Makefile.include
+++ b/examples/stm32/f4/Makefile.include
@@ -26,7 +26,7 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
GDB = $(PREFIX)-gdb
-ifeq ($(shell ls ../../../../../lib/libopencm3_stm32f4.a 2>/dev/null),)
+ifeq ($(wildcard ../../../../../lib/libopencm3_stm32f4.a),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
else
ifeq ($(V),1)