From 86db7153321978e8ce2dc698ef3b88cd4f67cb41 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 24 Jul 2009 14:42:44 +0200 Subject: [PATCH] Simplify example Makefiles by using only one TOOLCHAIN_DIR variable. --- examples/fancyblink/Makefile | 14 +++++--------- examples/miniblink/Makefile | 14 +++++--------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/examples/fancyblink/Makefile b/examples/fancyblink/Makefile index 09ec0ee9..fde0bc8e 100644 --- a/examples/fancyblink/Makefile +++ b/examples/fancyblink/Makefile @@ -25,16 +25,12 @@ CC = $(PREFIX)-gcc LD = $(PREFIX)-ld OBJCOPY = $(PREFIX)-objcopy OBJDUMP = $(PREFIX)-objdump - -TOOLCHAIN_LIB_DIR = `dirname \`which $(CC)\``/../$(PREFIX)/lib -#TOOLCHAIN_LIB_DIR = ../../lib # uncomment for local directory builds - -TOOLCHAIN_INCLUDE_DIR = -#TOOLCHAIN_INCLUDE_DIR = ../../include # uncomment for local directory builds - -CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_INCLUDE_DIR) -fno-common \ +# Uncomment this line if you want to use the installed (not local) library. +# TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX) +TOOLCHAIN_DIR = ../.. +CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ -mcpu=cortex-m3 -mthumb -LDFLAGS = -T$(BINARY).ld -nostartfiles -L$(TOOLCHAIN_LIB_DIR) +LDFLAGS = -T$(BINARY).ld -nostartfiles -L$(TOOLCHAIN_DIR)/lib OBJS = $(BINARY).o OPENOCD = openocd diff --git a/examples/miniblink/Makefile b/examples/miniblink/Makefile index 1b5bd890..9ae04490 100644 --- a/examples/miniblink/Makefile +++ b/examples/miniblink/Makefile @@ -25,16 +25,12 @@ CC = $(PREFIX)-gcc LD = $(PREFIX)-ld OBJCOPY = $(PREFIX)-objcopy OBJDUMP = $(PREFIX)-objdump - -TOOLCHAIN_LIB_DIR = `dirname \`which $(CC)\``/../$(PREFIX)/lib -#TOOLCHAIN_LIB_DIR = ../../lib # uncomment for local directory builds - -TOOLCHAIN_INCLUDE_DIR = -#TOOLCHAIN_INCLUDE_DIR = ../../include # uncomment for local directory builds - -CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_INCLUDE_DIR) -fno-common \ +# Uncomment this line if you want to use the installed (not local) library. +# TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX) +TOOLCHAIN_DIR = ../.. +CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ -mcpu=cortex-m3 -mthumb -LDFLAGS = -T$(BINARY).ld -nostartfiles -L$(TOOLCHAIN_LIB_DIR) +LDFLAGS = -T$(BINARY).ld -nostartfiles -L$(TOOLCHAIN_DIR)/lib OBJS = $(BINARY).o OPENOCD = openocd