X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm-demo%2FMakefile;h=98fcd9e587f6721bda89fd85900db01547c72037;hp=f1655d57147efee2457093cec5d8bc53e2f8bc63;hb=a4596c134aa5e7867f1ca1d86d36afb2af9b8999;hpb=c1531fb26461b9f4ec39672bbfaeb70e6f4d1056

diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index f1655d57..98fcd9e5 100644
--- 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
 
 #
@@ -18,6 +17,7 @@ INC = \
 #
 ALTOS_SRC = \
 	ao_interrupt.c \
+	ao_boot_chain.c \
 	ao_product.c \
 	ao_romconfig.c \
 	ao_cmd.c \
@@ -28,7 +28,15 @@ 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
 
 PRODUCT=StmDemo-v0.0
 PRODUCT_DEF=-DSTM_DEMO
@@ -36,33 +44,29 @@ IDPRODUCT=0x000a
 
 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
-
-../altitude.h: make-altitude
-	nickle $< > $@
-
-$(OBJ): $(INC)
+$(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) > $@
 
-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 *.elf *.ihx
 	rm -f ao_product.h
 
 install: