stm-demo does not use altitude.h

diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index 510bee6acb989a0faeb27c2f7569f9fe64eeb252..b07d1e1daba501cc2f72758823a0c8df98ea4533 100644 (file)
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -45,8 +45,6 @@ OBJ=$(SRC:.c=.o)
 
 all: $(PROG)
 
 
 all: $(PROG)
 

-LDFLAGS=-L../stm -Wl,-Taltos.ld
-

 $(PROG): Makefile $(OBJ)
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
 
 $(PROG): Makefile $(OBJ)
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
 

diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index f1655d57147efee2457093cec5d8bc53e2f8bc63..366291c6e079306f18dec5c68b1b86b6ec9ebe59 100644 (file)
--- a/src/stm-demo/Makefile
+++ b/src/stm-demo/Makefile
@@ -9,8 +9,6 @@ INC = \
        ao.h \
        ao_arch.h \
        ao_pins.h \
        ao.h \
        ao_arch.h \
        ao_pins.h \

-       altitude.h \
-       ao_kalman.h \

        ao_product.h
 
 #
        ao_product.h
 
 #


@@ -48,16 +46,10 @@ LDFLAGS=-L../stm -Wl,-Taltos.ld
 $(PROG): Makefile $(OBJ)
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
 
 $(PROG): Makefile $(OBJ)
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
 

-../altitude.h: make-altitude
-       nickle $< > $@
-
-$(OBJ): $(INC)
-

 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
 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
 
 
 distclean:     clean