X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2FMakefile;h=bdd3307a1a9df579dbf3144e685f53be62dd629f;hp=ae231c64af20a19482965819a36a0ceb77f02223;hb=2ecb6a8276b2ce40d2a4da586dbc17581cfda26d;hpb=6a1e398e590121458176758858bb4210f3eb5a55

diff --git a/src/Makefile b/src/Makefile
index ae231c64..bdd3307a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,7 +26,8 @@ SDCCDIRS=\
 
 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 \
@@ -39,20 +40,24 @@ ARMM0DIRS=\
 AVRDIRS=\
 	telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
 
+SUBDIRS=
+
 ifeq ($(strip $(HAVE_SDCC)),yes)
-	SUBDIRS += $(SDCCDIRS)
+SUBDIRS+=$(SDCCDIRS)
 endif
 
-ifeq ($(strip ($HAVE_ARM_M3_CC)),yes)
-	SUBDIRS += $(ARMM3DIRS)
+ifeq ($(strip $(HAVE_ARM_M3_CC)),yes)
+SUBDIRS+=$(ARMM3DIRS)
+foo=bar
 endif
 
-ifneq ($(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)
-	SUBDIRS += $(AVRDIRS)
+SUBDIRS += $(AVRDIRS)
 endif
 
 ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS)