projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Add multiple zoom levels and content types to map
[fw/altos]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 3e4ed68d4d630180872444c45012bb21b1cccdc1..ae128b7cd9de90fd5435f0e6c1d7353d01cf4a06 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-13,6
+13,7
@@
vpath load_csv.5c kalman
vpath matrix.5c kalman
include Version
vpath matrix.5c kalman
include Version
+TOPDIR=.
include Makedefs
SDCCDIRS=\
include Makedefs
SDCCDIRS=\
@@
-26,12
+27,13
@@
SDCCDIRS=\
ARMM3DIRS=\
telemega-v0.1 telemega-v0.1/flash-loader \
ARMM3DIRS=\
telemega-v0.1 telemega-v0.1/flash-loader \
- telemega-v0.3 telemega-v0.3/flash-loader \
+ telemega-v1.0 telemega-v1.0/flash-loader \
+ telemetrum-v2.0 telemetrum-v2.0/flash-loader \
megadongle-v0.1 megadongle-v0.1/flash-loader \
telegps-v0.3 telegps-v0.3/flash-loader \
megadongle-v0.1 megadongle-v0.1/flash-loader \
telegps-v0.3 telegps-v0.3/flash-loader \
- stm-bringup stm-demo \
telelco-v0.2 telelco-v0.2/flash-loader \
telelco-v0.2 telelco-v0.2/flash-loader \
- telescience-v0.2 telescience-v0.2/flash-loader
+ telescience-v0.2 telescience-v0.2/flash-loader \
+ teleballoon-v2.0
ARMM0DIRS=\
easymini-v1.0 easymini-v1.0/flash-loader
ARMM0DIRS=\
easymini-v1.0 easymini-v1.0/flash-loader
@@
-39,20
+41,29
@@
ARMM0DIRS=\
AVRDIRS=\
telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
AVRDIRS=\
telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
+SUBDIRS=
+
+ifeq ($(strip $(HAVE_PDCLIB)),yes)
+PDCLIB=pdclib
+CLEAN_PDCLIB=clean-pdclib
+endif
+
ifeq ($(strip $(HAVE_SDCC)),yes)
ifeq ($(strip $(HAVE_SDCC)),yes)
-
SUBDIRS +=
$(SDCCDIRS)
+
SUBDIRS+=
$(SDCCDIRS)
endif
endif
-ifeq ($(strip ($HAVE_ARM_M3_CC)),yes)
- SUBDIRS += $(ARMM3DIRS)
+ifeq ($(strip $(HAVE_ARM_M3_CC)),yes)
+SUBDIRS+=$(ARMM3DIRS)
+foo=bar
endif
endif
-ifeq ($(strip ($HAVE_ARM_M0_CC)),yes)
- SUBDIRS += $(ARMM0DIRS)
+ifeq ($(strip $(HAVE_ARM_M0_CC)),yes)
+SUBDIRS+=$(ARMM0DIRS)
+baz=bletch
endif
ifeq ($(strip $(HAVE_AVR_CC)),yes)
endif
ifeq ($(strip $(HAVE_AVR_CC)),yes)
-
SUBDIRS += $(AVRDIRS)
+SUBDIRS += $(AVRDIRS)
endif
ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS)
endif
ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS)
@@
-87,7
+98,7
@@
uninstall:
all-recursive: all-local
all-recursive: all-local
-all-local: altitude.h altitude-pa.h ao_kalman.h ao_whiten.h
+all-local: altitude.h altitude-pa.h ao_kalman.h ao_whiten.h
$(PDCLIB)
altitude.h: make-altitude
nickle $< > $@
altitude.h: make-altitude
nickle $< > $@
@@
-101,5
+112,13
@@
ao_kalman.h: make-kalman kalman.5c kalman_filter.5c load_csv.5c matrix.5c
ao_whiten.h: make-whiten
nickle $< > $@
ao_whiten.h: make-whiten
nickle $< > $@
-clean-local:
+clean-local:
$(CLEAN_PDCLIB)
rm -f altitude.h ao_kalman.h
rm -f altitude.h ao_kalman.h
+
+pdclib:
+ mkdir -p $(PDCLIB_ROOT)/include $(PDCLIB_ROOT)/lib
+ cd ../pdclib && make && make prefix=`pwd`/../pdclib-root install
+
+clean-pdclib:
+ rm -rf $(PDCLIB_ROOT)
+ cd ../pdclib && make clean