Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / stm-demo / Makefile

diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index 09c9c3cabfe83b7c37445ed0dd6b3e160a01f719..ccce37a5a9b2cdbd175fe25b1bc01c4db2bfb4c8 100644 (file)
--- a/src/stm-demo/Makefile
+++ b/src/stm-demo/Makefile
@@ -9,6 +9,7 @@ INC = \
        ao.h \
        ao_arch.h \
        ao_arch_funcs.h \
+       ao_boot.h \
        ao_pins.h \
        ao_product.h
 
@@ -17,46 +18,47 @@ INC = \
 #
 ALTOS_SRC = \
        ao_interrupt.c \
+       ao_boot_chain.c \
        ao_product.c \
        ao_romconfig.c \
        ao_cmd.c \
        ao_task.c \
-       ao_led.c \
+       ao_led_stm.c \
        ao_stdio.c \
        ao_panic.c \
        ao_timer.c \
-       ao_serial_stm.c \
        ao_lcd_stm.c \
        ao_lcd_font.c \
        ao_mutex.c \
+       ao_storage.c \
+       ao_m25.c \
        ao_dma_stm.c \
        ao_spi_stm.c \
        ao_adc_stm.c \
        ao_data.c \
        ao_i2c_stm.c \
        ao_usb_stm.c \
-       ao_exti_stm.c \
-       ao_event.c \
-       ao_quadrature.c \
-       ao_button.c
+       ao_exti_stm.c
 
 PRODUCT=StmDemo-v0.0
 PRODUCT_DEF=-DSTM_DEMO
 IDPRODUCT=0x000a
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -O0
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os
 
-PROG=stm-demo
+PROG=stm-demo-$(VERSION)
+ELF=$(PROG).elf
+IHX=$(PROG).ihx
 
 SRC=$(ALTOS_SRC) ao_demo.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG)
+all: $(ELF) $(IHX)
 
 LDFLAGS=-L../stm -Wl,-Taltos.ld
 
-$(PROG): Makefile $(OBJ)
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+$(ELF): Makefile $(OBJ)
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(LIBS)
 
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
@@ -66,7 +68,7 @@ $(OBJ): $(INC)
 distclean:     clean
 
 clean:
-       rm -f *.o $(PROG)
+       rm -f *.o *.elf *.ihx
        rm -f ao_product.h
 
 install: