X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2FMakefile.defs;h=2ed89f7e3c4ee56b5fdebb37329c4f6fa815bf3c;hb=2ea3f551b3c4649320efe2fd999f01012bca03bd;hp=6191ec45d37a6bd4df4916eaff082b7e33a33d12;hpb=c1531fb26461b9f4ec39672bbfaeb70e6f4d1056;p=fw%2Faltos

diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index 6191ec45..2ed89f7e 100644
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -1,35 +1,7 @@
-vpath % ../stm:../product:../drivers:../core:../util:../kalman:..
-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
-
-CC=arm-none-eabi-gcc
-SAT=$(HOME)/sat
-SAT_CLIB=$(SAT)/lib/pdclib.a
-SAT_CFLAGS=-I$(SAT)/include
-
-ifndef VERSION
-include ../Version
+ifndef TOPDIR
+TOPDIR=..
 endif
 
-AO_CFLAGS=-I. -I../stm -I../core -I..
-STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
-
-LDFLAGS=-L../stm -Wl,-Taltos.ld
-
-NICKLE=nickle
-
-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)
+include $(TOPDIR)/stm/Makefile-stm.defs
 
-.c.o:
-	$(call quiet,CC) -c $(CFLAGS) -o $@ $<
+LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm -Taltos.ld -n