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

[fw/altos] / src / telemetrum-v2.0 / Makefile

diff --git a/src/telemetrum-v2.0/Makefile b/src/telemetrum-v2.0/Makefile
index c03a553938aad26fb7f02dc16b3b462eea4c42b3..e0192f610721fc5221422d7ad634e55cbb1ca412 100644 (file)
--- a/src/telemetrum-v2.0/Makefile
+++ b/src/telemetrum-v2.0/Makefile
@@ -9,6 +9,7 @@ INC = \
        ao.h \
        ao_arch.h \
        ao_arch_funcs.h \
+       ao_boot.h \
        ao_companion.h \
        ao_data.h \
        ao_sample.h \
@@ -45,7 +46,7 @@ ALTOS_SRC = \
        ao_cmd.c \
        ao_config.c \
        ao_task.c \
-       ao_led.c \
+       ao_led_stm.c \
        ao_stdio.c \
        ao_panic.c \
        ao_timer.c \
@@ -70,8 +71,10 @@ ALTOS_SRC = \
        ao_m25.c \
        ao_usb_stm.c \
        ao_exti_stm.c \
+       ao_eeprom_stm.c \
        ao_report.c \
        ao_convert_pa.c \
+       ao_convert_volt.c \
        ao_log.c \
        ao_log_metrum.c \
        ao_sample.c \
@@ -94,14 +97,15 @@ CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STA
 
 PROGNAME=telemetrum-v2.0
 PROG=$(PROGNAME)-$(VERSION).elf
+HEX=$(PROGNAME)-$(VERSION).ihx
 
 SRC=$(ALTOS_SRC) ao_telemetrum.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG)
+all: $(PROG) $(HEX)
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ../altitude-pa.h: make-altitude-pa
        nickle $< > $@
@@ -114,7 +118,7 @@ ao_product.h: ao-make-product.5c ../Version
 distclean:     clean
 
 clean:
-       rm -f *.o $(PROGNAME)-*.elf
+       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
        rm -f ao_product.h
 
 install: