From 7501238ec2ba8e58ee4193585beee23bd363a0b8 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Thu, 7 Jun 2012 16:55:06 -0700 Subject: [PATCH] Change use of Makefile BINARY to TARGET. --- firmware/blinky/Makefile | 4 ++-- firmware/common/Makefile_inc.mk | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/blinky/Makefile b/firmware/blinky/Makefile index 96e5a9ba..63d3cce5 100644 --- a/firmware/blinky/Makefile +++ b/firmware/blinky/Makefile @@ -1,7 +1,7 @@ # Hey Emacs, this is a -*- makefile -*- -BINARY = blinky +TARGET = blinky -SRC = $(BINARY).c +SRC = $(TARGET).c include ../common/Makefile_inc.mk diff --git a/firmware/common/Makefile_inc.mk b/firmware/common/Makefile_inc.mk index 96d6967a..482fbe0b 100644 --- a/firmware/common/Makefile_inc.mk +++ b/firmware/common/Makefile_inc.mk @@ -49,10 +49,10 @@ CFLAGS += -O2 -g -Wall -Wextra -I$(LIBOPENCM3)/include -I../common \ -fno-common -mcpu=cortex-m4 -mthumb -MD \ -mfloat-abi=hard -mfpu=fpv4-sp-d16 \ $(HACKRF_OPTS) -LDSCRIPT ?= $(BINARY).ld +LDSCRIPT ?= $(TARGET).ld LDFLAGS += -L$(TOOLCHAIN_DIR)/lib/armv7e-m/fpu \ -L$(LIBOPENCM3)/lib/lpc43xx -T$(LDSCRIPT) -nostartfiles \ - -Wl,--gc-sections -Xlinker -Map=$(BINARY).map + -Wl,--gc-sections -Xlinker -Map=$(TARGET).map OBJ = $(SRC:.c=.o) # Be silent per default, but 'make V=1' will show all compiler calls. @@ -69,8 +69,8 @@ endif all: images -images: $(BINARY).images -flash: $(BINARY).flash +images: $(TARGET).images +flash: $(TARGET).flash %.images: %.bin %.hex %.srec %.list @#echo "*** $* images generated ***"