X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2FMakefile;h=ee76c32579af451cd4d0ebd33e40fde6876315b8;hp=5851b2a8905247df0b215b2e973d451e0ac54388;hb=f222e8504bfd01027e3c380c239a2cde2c367d74;hpb=c57e1630002c921739ff22395497d93027d381b6

diff --git a/src/Makefile b/src/Makefile
index 5851b2a8..ee76c325 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,17 +16,14 @@ include Version
 
 SDCCDIRS=\
 	telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
-	teledongle-v0.2 teledongle-v0.1 \
-	telemini-v1.0 telenano-v0.1 \
+	teledongle-v0.2 \
+	telemini-v1.0 \
 	telebt-v1.0 \
-	telemetrum-v0.1-sky telemetrum-v0.1-sirf \
-	telelaunch-v0.1 tidongle test \
 	teleterra-v0.2 teleshield-v0.1 \
-	telefire-v0.1 \
-	spiradio-v0.1
+	telefire-v0.1 telefire-v0.2
 
 AVRDIRS=\
-	telescience-v0.1 telescience-pwm telepyro-v0.1 micropeak
+	telescience-v0.1 telescience-pwm micropeak
 
 ARMDIRS=\
 	telemega-v0.1 telemega-v0.1/flash-loader \
@@ -35,7 +32,9 @@ ARMDIRS=\
 	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 \
+	telescience-v0.2 telescience-v0.2/flash-loader
+
+ARMM0DIRS=\
 	easymini-v0.1
 
 ifneq ($(shell which sdcc),)
@@ -46,10 +45,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