X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm-demo%2FMakefile;h=3b1b671b27294d50e01dec5dd0a67b3445380476;hp=ecdf6b7f28b27cf36cc0fc860213b69812b3375a;hb=97efce5f7ff227aaa8990529217d3d10db3443dc;hpb=6da2f5846f2d28ea1f09f60ef2cc3f68113ac62a

diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index ecdf6b7f..3b1b671b 100644
--- a/src/stm-demo/Makefile
+++ b/src/stm-demo/Makefile
@@ -2,32 +2,15 @@
 # AltOS build
 #
 #
-vpath % ..:../core:../product:../drivers:../stm
-vpath make-altitude ../util
-vpath make-kalman ../util
-vpath kalman.5c ../kalman
-vpath kalman_filter.5c ../kalman
-vpath load_csv.5c ../kalman
-vpath matrix.5c ../kalman
-vpath ao-make-product.5c ../util
-
-#PROGRAMMER=stk500v2 -P usb
-#PROGRAMMER=usbtiny
-#LOADCMD=avrdude
-#LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=arm-none-eabi-gcc
-#OBJCOPY=avr-objcopy
-
-ifndef VERSION
-include ../Version
-endif
+
+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
 
 #
 # Common AltOS sources
@@ -44,58 +27,48 @@ 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
-CPU=cortex-m3
-CFLAGS = $(PRODUCT_DEF) -I. -I../stm -I../core -I..
-CFLAGS += -g -std=gnu99 -O0 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib -I../stm $(CINC)
 
-NICKLE=nickle
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os
 
 PROG=stm-demo
 
 SRC=$(ALTOS_SRC) ao_demo.c
 OBJ=$(SRC:.c=.o)
 
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
 all: $(PROG)
 
-CLIB=/home/keithp/sat/lib/pdclib.a
-CINC=-I/home/keithp/sat/include
 LDFLAGS=-L../stm -Wl,-Taltos.ld
 
 $(PROG): Makefile $(OBJ)
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(CLIB) -lgcc
-
-../altitude.h: make-altitude
-	nickle $< > $@
-
-$(OBJ): $(INC)
+	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
 
 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:
 
 uninstall:
-
-$(OBJ): ao.h ao_product.h
\ No newline at end of file