projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Don't try to report bearing/elevation without GPS
[fw/altos]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 23cd2920d6e9a8b66c70258c1cf61ee2f6b53f10..e7fa728bcfe1a66eb4058c7d20594ef38eb633f9 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
+include Makedefs
SDCCDIRS=\
telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
SDCCDIRS=\
telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
@@
-23,12
+24,10
@@
SDCCDIRS=\
telefire-v0.1 telefire-v0.2 \
telemini-v2.0
telefire-v0.1 telefire-v0.2 \
telemini-v2.0
-AVRDIRS=\
- telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
-
-ARMDIRS=\
+ARMM3DIRS=\
telemega-v0.1 telemega-v0.1/flash-loader \
telemega-v0.3 telemega-v0.3/flash-loader \
telemega-v0.1 telemega-v0.1/flash-loader \
telemega-v0.3 telemega-v0.3/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 \
stm-bringup stm-demo \
megadongle-v0.1 megadongle-v0.1/flash-loader \
telegps-v0.3 telegps-v0.3/flash-loader \
stm-bringup stm-demo \
@@
-38,23
+37,30
@@
ARMDIRS=\
ARMM0DIRS=\
easymini-v1.0 easymini-v1.0/flash-loader
ARMM0DIRS=\
easymini-v1.0 easymini-v1.0/flash-loader
-ifneq ($(shell which sdcc),)
- SUBDIRS += $(SDCCDIRS)
+AVRDIRS=\
+ telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
+
+SUBDIRS=
+
+ifeq ($(strip $(HAVE_SDCC)),yes)
+SUBDIRS+=$(SDCCDIRS)
endif
endif
-ifneq ($(shell which avr-gcc),)
- SUBDIRS += $(AVRDIRS)
+ifeq ($(strip $(HAVE_ARM_M3_CC)),yes)
+SUBDIRS+=$(ARMM3DIRS)
+foo=bar
endif
endif
-ifneq ($(shell which /opt/cortex/bin/arm-none-eabi-gcc),)
- SUBDIRS += $(ARMDIRS)
+ifeq ($(strip $(HAVE_ARM_M0_CC)),yes)
+SUBDIRS+=$(ARMM0DIRS)
+baz=bletch
endif
endif
-if
neq ($(shell which /usr/bin/arm-none-eabi-gcc),
)
-
SUBDIRS += $(ARMM0
DIRS)
+if
eq ($(strip $(HAVE_AVR_CC)),yes
)
+
SUBDIRS += $(AVR
DIRS)
endif
endif
-ALLDIRS=$(SDCCDIRS) $(A
VRDIRS) $(ARM
DIRS)
+ALLDIRS=$(SDCCDIRS) $(A
RMM3DIRS) $(ARMM0DIRS) $(AVR
DIRS)
all: all-local all-recursive
all: all-local all-recursive