X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2FMakefile;h=bdd3307a1a9df579dbf3144e685f53be62dd629f;hp=23cd2920d6e9a8b66c70258c1cf61ee2f6b53f10;hb=ecb0465be76e9299511aeec663d267967834f6c3;hpb=258d225df1f4afe1cfdc9c43208bcd75d18cdf2d

diff --git a/src/Makefile b/src/Makefile
index 23cd2920..bdd3307a 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,12 +24,10 @@ SDCCDIRS=\
 	telefire-v0.1 telefire-v0.2 \
 	telemini-v2.0
 
-AVRDIRS=\
-	telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
-
-ARMDIRS=\
+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 \
@@ -38,23 +37,30 @@ ARMDIRS=\
 ARMM0DIRS=\
 	easymini-v1.0 easymini-v1.0/flash-loader
 
-ifneq ($(shell which sdcc),)
-	SUBDIRS += $(SDCCDIRS)
+AVRDIRS=\
+	telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
+
+SUBDIRS=
+
+ifeq ($(strip $(HAVE_SDCC)),yes)
+SUBDIRS+=$(SDCCDIRS)
 endif
 
-ifneq ($(shell which avr-gcc),)
-	SUBDIRS += $(AVRDIRS)
+ifeq ($(strip $(HAVE_ARM_M3_CC)),yes)
+SUBDIRS+=$(ARMM3DIRS)
+foo=bar
 endif
 
-ifneq ($(shell which /opt/cortex/bin/arm-none-eabi-gcc),)
-	SUBDIRS += $(ARMDIRS)
+ifeq ($(strip $(HAVE_ARM_M0_CC)),yes)
+SUBDIRS+=$(ARMM0DIRS)
+baz=bletch
 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