altos: re-enable optimization for stm-demo. remove unused bits

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

diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index f2e6618e19ace9e83609d3d118e067f1202c0e21..3b1b671b27294d50e01dec5dd0a67b3445380476 100644 (file)
--- a/src/stm-demo/Makefile
+++ b/src/stm-demo/Makefile
@@ -8,9 +8,8 @@ include ../stm/Makefile.defs
 INC = \
        ao.h \
        ao_arch.h \
+       ao_arch_funcs.h \
        ao_pins.h \
-       altitude.h \
-       ao_kalman.h \
        ao_product.h
 
 #
@@ -28,13 +27,24 @@ ALTOS_SRC = \
        ao_timer.c \
        ao_serial_stm.c \
        ao_lcd_stm.c \
-       ao_lcd_font.c
+       ao_lcd_font.c \
+       ao_mutex.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
 
 PRODUCT=StmDemo-v0.0
 PRODUCT_DEF=-DSTM_DEMO
 IDPRODUCT=0x000a
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS)
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os
 
 PROG=stm-demo
 
@@ -48,21 +58,15 @@ LDFLAGS=-L../stm -Wl,-Taltos.ld
 $(PROG): Makefile $(OBJ)
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
 
-../altitude.h: make-altitude
-       nickle $< > $@
-
-$(OBJ): $(INC)
-
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
-ao_product.rel: ao_product.c ao_product.h
-       $(call quiet,CC) -c $(CFLAGS) -D PRODUCT_DEFS='\"ao_product.h\"' -o$@ $<
+$(OBJ): $(INC)
 
 distclean:     clean
 
 clean:
-       rm -f $(OBJ)
+       rm -f *.o $(PROG)
        rm -f ao_product.h
 
 install: