projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Broke TeleMetrum GPS reporting by holding the GPS mutex too much
[fw/altos]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 3e4ed68d4d630180872444c45012bb21b1cccdc1..bdd3307a1a9df579dbf3144e685f53be62dd629f 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-26,7
+26,8
@@
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 \
stm-bringup stm-demo \
megadongle-v0.1 megadongle-v0.1/flash-loader \
telegps-v0.3 telegps-v0.3/flash-loader \
stm-bringup stm-demo \
@@
-39,20
+40,24
@@
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_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)