summaryrefslogtreecommitdiff
path: root/src/megametrum-v0.1
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-10-18 15:18:52 -0700
committerKeith Packard <keithp@keithp.com>2012-10-18 15:18:52 -0700
commit5a55501660ebab3b858a48483c5df1cfb4e858e4 (patch)
tree9b5d8305d9c65b10f82f6839bb1b5c169681ef00 /src/megametrum-v0.1
parent0361235c9ef56738ba0e97be88a85afef0ce8268 (diff)
parent440365bd17d804c2f574c35164612cf1682397d7 (diff)
Merge branch 'master' into mm-ms5611
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/megametrum-v0.1')
-rw-r--r--src/megametrum-v0.1/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index a93f6f17..0e0534a5 100644
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -13,7 +13,7 @@ INC = \
ao_data.h \
ao_sample.h \
ao_pins.h \
- altitude.h \
+ altitude-pa.h \
ao_kalman.h \
ao_product.h \
ao_ms5607.h \
@@ -99,7 +99,7 @@ all: $(PROG)
$(PROG): Makefile $(OBJ) altos.ld
$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
-../altitude.h: make-altitude
+../altitude-pa.h: make-altitude-pa
nickle $< > $@
$(OBJ): $(INC)