projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lpc: Reset less of the device on USB reset.
[fw/altos]
/
src
/
product
/
Makefile.telemetrum
diff --git
a/src/product/Makefile.telemetrum
b/src/product/Makefile.telemetrum
index fba2c19ab582b2194755e90b20bdc1e5bb22caf5..c740a4831149325ca8bf67965847696de6150598 100644
(file)
--- a/
src/product/Makefile.telemetrum
+++ b/
src/product/Makefile.telemetrum
@@
-36,8
+36,8
@@
CORE_SRC = \
ao_stdio.c \
ao_storage.c \
ao_task.c \
ao_stdio.c \
ao_storage.c \
ao_task.c \
- ao_flight
_mm
.c \
- ao_sample
_mm
.c \
+ ao_flight.c \
+ ao_sample.c \
ao_kalman.c \
ao_log.c \
ao_log_big.c \
ao_kalman.c \
ao_log.c \
ao_log_big.c \
@@
-75,7
+75,8
@@
SRC = \
$(DRIVER_SRC) \
$(PRODUCT_SRC)
$(DRIVER_SRC) \
$(PRODUCT_SRC)
-PROG = telemetrum-v$(TM_VER)-$(VERSION)$(TM_EXTRA).ihx
+PROGNAME = telemetrum-v$(TM_VER)$(TM_EXTRA)
+PROG = $(PROGNAME)-$(VERSION).ihx
PRODUCT=TeleMetrum-v$(TM_VER)
PRODUCT_DEF=-DTELEMETRUM_V_$(TM_DEF)
IDPRODUCT=0x000b
PRODUCT=TeleMetrum-v$(TM_VER)
PRODUCT_DEF=-DTELEMETRUM_V_$(TM_DEF)
IDPRODUCT=0x000b
@@
-93,10
+94,10
@@
endif
# Otherwise, print the full command line.
quiet ?= $($1)
# Otherwise, print the full command line.
quiet ?= $($1)
-all:
../
$(PROG)
+all: $(PROG)
-
../
$(PROG): $(REL) Makefile
- $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
&& cp $(PROG) $(PMAP) ..
+$(PROG): $(REL) Makefile
+ $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
ao_product.h: ao-make-product.5c ../Version
$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
ao_product.h: ao-make-product.5c ../Version
@@
-104,11
+105,7
@@
ao_product.h: ao-make-product.5c ../Version
distclean: clean
distclean: clean
-clean:
- rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
- rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
- rm -f ao_product.h
- rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
install:
install: