X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2FMakefile;h=3e4ed68d4d630180872444c45012bb21b1cccdc1;hp=af2630fc464f3e37de13087c2450b3902b4abb7d;hb=f7cccbb7a624a2a47b21682f416a135a28319b41;hpb=377a44cbfd5c8a659d2fecabb154726717a41900

diff --git a/src/Makefile b/src/Makefile
index af2630fc..3e4ed68d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,6 +13,7 @@ vpath load_csv.5c kalman
 vpath matrix.5c kalman
 
 include Version
+include Makedefs
 
 SDCCDIRS=\
 	telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
@@ -23,39 +24,38 @@ SDCCDIRS=\
 	telefire-v0.1 telefire-v0.2 \
 	telemini-v2.0
 
-AVRDIRS=\
-	telescience-v0.1 telescience-pwm micropeak
-
-ARMDIRS=\
+ARMM3DIRS=\
 	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.3 telegps-v0.3/flash-loader \
 	stm-bringup stm-demo \
 	telelco-v0.2 telelco-v0.2/flash-loader \
-	telescience-v0.2 telescience-v0.2/flash-loader \
-	easymini-v0.1 easymini-v0.1/flash-loader
+	telescience-v0.2 telescience-v0.2/flash-loader
 
 ARMM0DIRS=\
-	easymini-v0.1
+	easymini-v1.0 easymini-v1.0/flash-loader
+
+AVRDIRS=\
+	telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
 
-ifneq ($(shell which sdcc),)
+ifeq ($(strip $(HAVE_SDCC)),yes)
 	SUBDIRS += $(SDCCDIRS)
 endif
 
-ifneq ($(shell which avr-gcc),)
-	SUBDIRS += $(AVRDIRS)
+ifeq ($(strip ($HAVE_ARM_M3_CC)),yes)
+	SUBDIRS += $(ARMM3DIRS)
 endif
 
-ifneq ($(shell which /opt/cortex/bin/arm-none-eabi-gcc),)
-	SUBDIRS += $(ARMDIRS)
+ifeq ($(strip ($HAVE_ARM_M0_CC)),yes)
+	SUBDIRS += $(ARMM0DIRS)
 endif
 
-ifneq ($(shell which /usr/bin/arm-none-eabi-gcc),)
-	SUBDIRS += $(ARMM0DIRS)
+ifeq ($(strip $(HAVE_AVR_CC)),yes)
+	SUBDIRS += $(AVRDIRS)
 endif
 
-ALLDIRS=$(SDCCDIRS) $(AVRDIRS) $(ARMDIRS)
+ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS)
 
 all: all-local all-recursive