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

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

diff --git a/src/telegps-v2.0/Makefile b/src/telegps-v2.0/Makefile
index 58cf26e8c755b600cc7ae55e1b424c1272f25b08..617efa65a346e482b55ef13721f7dc39b669180a 100644 (file)
--- a/src/telegps-v2.0/Makefile
+++ b/src/telegps-v2.0/Makefile
@@ -13,8 +13,7 @@ INC = \
        ao_product.h \
        ao_tracker.h \
        ao_task.h \
-       ao_whiten.h \
-       ao_cc115l.h \
+       ao_cc1200.h \
        ao_fec.h \
        stm32f0.h \
        Makefile
@@ -22,8 +21,9 @@ INC = \
 
 ALTOS_SRC = \
        ao_adc_stm.c \
-       ao_led.c \
+       ao_led_stmf0.c \
        ao_interrupt.c \
+       ao_boot_chain.c \
        ao_product.c \
        ao_romconfig.c \
        ao_cmd.c \
@@ -42,7 +42,6 @@ ALTOS_SRC = \
        ao_gps_ublox.c \
        ao_gps_show.c \
        ao_cc1200.c \
-       ao_fec_tx.c \
        ao_aprs.c \
        ao_tracker.c \
        ao_telemetry.c \
@@ -71,10 +70,8 @@ OBJ=$(SRC:.c=.o)
 
 all: $(PROG) $(HEX)
 
-LDFLAGS=-L../stmf0 -Wl,-Taltos.ld
-
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
+       $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 $(OBJ): $(INC)