Merge remote-tracking branch 'mjb/master'

[fw/altos] / src / megametrum-v0.1 / Makefile

diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index 6fc9324e1d501a25b15dc88b141ec2486707e865..a93f6f1742d856ad19a36718a1590a4f04007ab1 100644 (file)
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -9,6 +9,7 @@ INC = \
        ao.h \
        ao_arch.h \
        ao_arch_funcs.h \
+       ao_companion.h \
        ao_data.h \
        ao_sample.h \
        ao_pins.h \
@@ -18,6 +19,7 @@ INC = \
        ao_ms5607.h \
        ao_hmc5883.h \
        ao_mpu6000.h \
+       ao_mma655x.h \
        ao_cc1120_CC1120.h \
        ao_profile.h \
        ao_whiten.h \
@@ -54,7 +56,10 @@ ALTOS_SRC = \
        ao_cc1120.c \
        ao_fec_tx.c \
        ao_fec_rx.c \
+       ao_data.c \
        ao_ms5607.c \
+       ao_mma655x.c \
+       ao_hmc5883.c \
        ao_adc_stm.c \
        ao_beep_stm.c \
        ao_storage.c \
@@ -67,13 +72,14 @@ ALTOS_SRC = \
        ao_convert_pa.c \
        ao_log.c \
        ao_log_mega.c \
-       ao_sample_mm.c \
+       ao_sample.c \
        ao_kalman.c \
-       ao_flight_mm.c \
+       ao_flight.c \
        ao_telemetry.c \
        ao_packet_slave.c \
        ao_packet.c \
        ao_companion.c \
+       ao_pyro.c \
        $(PROFILE)
 
 PRODUCT=MegaMetrum-v0.1
@@ -82,14 +88,15 @@ IDPRODUCT=0x0023
 
 CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g
 
-PROG=megametrum-v0.1-$(VERSION).elf
+PROGNAME=megametrum-v0.1
+PROG=$(PROGNAME)-$(VERSION).elf
 
 SRC=$(ALTOS_SRC) ao_megametrum.c
 OBJ=$(SRC:.c=.o)
 
 all: $(PROG)
 
-$(PROG): Makefile $(OBJ)
+$(PROG): Makefile $(OBJ) altos.ld
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
 
 ../altitude.h: make-altitude
@@ -103,7 +110,7 @@ ao_product.h: ao-make-product.5c ../Version
 distclean:     clean
 
 clean:
-       rm -f $(OBJ)
+       rm -f *.o $(PROGNAME)-*.elf
        rm -f ao_product.h
 
 install: