Separate out cortex-m0 compiler tests in configure

[fw/altos] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index e271ddf3f3f9d9c4608e5664cd6fe5c1403c5c31..7ffc52d6431d9b90d9621668f12226f849a0a37d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,8 +29,16 @@ AVRDIRS=\
        telescience-v0.1 telescience-pwm telepyro-v0.1 micropeak
 
 ARMDIRS=\
-       telemega-v0.1 megadongle-v0.1 stm-bringup stm-demo telelco-v0.1 \
-       telescience-v0.2
+       telemega-v0.1 telemega-v0.1/flash-loader \
+       telemega-v0.3 telemega-v0.3/flash-loader \
+       megadongle-v0.1 megadongle-v0.1/flash-loader \
+       telegps-v0.1 telegps-v0.1/flash-loader \
+       stm-bringup stm-demo \
+       telelco-v0.2 telelco-v0.2/flash-loader \
+       telescience-v0.2 telescience-v0.2/flash-loader
+
+ARMM0DIRS=\
+       easymini-v0.1
 
 ifneq ($(shell which sdcc),)
        SUBDIRS += $(SDCCDIRS)
@@ -40,10 +48,14 @@ ifneq ($(shell which avr-gcc),)
        SUBDIRS += $(AVRDIRS)
 endif
 
-ifneq ($(shell which arm-none-eabi-gcc),)
+ifneq ($(shell which /opt/cortex/bin/arm-none-eabi-gcc),)
        SUBDIRS += $(ARMDIRS)
 endif
 
+ifneq ($(shell which /usr/bin/arm-none-eabi-gcc),)
+       SUBDIRS += $(ARMM0DIRS)
+endif
+
 ALLDIRS=$(SDCCDIRS) $(AVRDIRS) $(ARMDIRS)
 
 all: all-local all-recursive