jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update makefiles to reflect stm32 lib folder name changes

Browse Source
This commit is contained in:
Stephen Caudle 2011-10-28 15:44:53 -04:00
parent b3a710b0bc
commit 1dc4645732
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -25,7 +25,7 @@ LIBDIR = $(DESTDIR)/$(PREFIX)/lib
SHAREDIR = $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts SHAREDIR = $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts
INSTALL = install INSTALL = install
TARGETS = stm32f1 stm32f2 lpc13xx lm3s TARGETS = stm32/f1 stm32/f2 lpc13xx lm3s
# 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)

6
lib/stm32/f1/Makefile
View File

@ -23,7 +23,7 @@ PREFIX ?= arm-none-eabi
#PREFIX ?= arm-elf #PREFIX ?= arm-elf
CC = $(PREFIX)-gcc CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar AR = $(PREFIX)-ar
CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \
-mcpu=cortex-m3 -mthumb -Wstrict-prototypes \ -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \
-ffunction-sections -fdata-sections -MD -DSTM32F1 -ffunction-sections -fdata-sections -MD -DSTM32F1
# ARFLAGS = rcsv # ARFLAGS = rcsv
@ -33,7 +33,7 @@ OBJS = vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \
usb_f103.o usb.o usb_control.o usb_standard.o can.o \ usb_f103.o usb.o usb_control.o usb_standard.o can.o \
timer.o usb_f107.o timer.o usb_f107.o
VPATH += ../usb:../stm32_common VPATH += ../../usb:../
# 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)
@ -51,7 +51,7 @@ $(LIBNAME).a: $(OBJS)
$(Q)$(CC) $(CFLAGS) -o $@ -c $< $(Q)$(CC) $(CFLAGS) -o $@ -c $<
clean: clean:
@printf " CLEAN lib/stm32f1\n" @printf " CLEAN lib/stm32/f1\n"
$(Q)rm -f *.o *.d $(Q)rm -f *.o *.d
$(Q)rm -f $(LIBNAME).a $(Q)rm -f $(LIBNAME).a

10
lib/stm32/f2/Makefile
View File

@ -23,15 +23,15 @@ PREFIX ?= arm-none-eabi
# PREFIX ?= arm-elf # PREFIX ?= arm-elf
CC = $(PREFIX)-gcc CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar AR = $(PREFIX)-ar
CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \
-mcpu=cortex-m3 -mthumb -Wstrict-prototypes \ -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \
-ffunction-sections -fdata-sections -MD -DSTM32F2 -ffunction-sections -fdata-sections -MD -DSTM32F2
# ARFLAGS = rcsv # ARFLAGS = rcsv
ARFLAGS = rcs ARFLAGS = rcs
OBJS = vector.o gpio.o systick.o i2c.o spi.o nvic.o usart.o exti.o rcc.o flash.o OBJS = vector.o rcc.o gpio.o usart.o spi.o flash.o nvic.o \
i2c.o systick.o exti.o \
#VPATH += ../usb VPATH += ../../usb:../
VPATH += ../stm32_common
# 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)
@ -49,7 +49,7 @@ $(LIBNAME).a: $(OBJS)
$(Q)$(CC) $(CFLAGS) -o $@ -c $< $(Q)$(CC) $(CFLAGS) -o $@ -c $<
clean: clean:
@printf " CLEAN lib/stm32f2\n" @printf " CLEAN lib/stm32/f2\n"
$(Q)rm -f *.o *.d $(Q)rm -f *.o *.d
$(Q)rm -f $(LIBNAME).a $(Q)rm -f $(LIBNAME).a