X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2FMakefile;h=ae231c64af20a19482965819a36a0ceb77f02223;hp=a17f51ac8846623bc218eca63b05c89a68af3ce7;hb=488a527267decece48e6682e0e0c7fc29cbed329;hpb=456120d201d72c89576a0c8d69b2fcba44169507

diff --git a/src/Makefile b/src/Makefile
index a17f51ac..ae231c64 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,41 +8,54 @@ vpath make-kalman util
 vpath make-whiten util
 vpath kalman.5c kalman
 vpath kalman_filter.5c kalman
+vpath kalman_micro.5c kalman
 vpath load_csv.5c kalman
 vpath matrix.5c kalman
 
 include Version
+include Makedefs
 
 SDCCDIRS=\
 	telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
-	teledongle-v0.2 teledongle-v0.1 \
-	telemini-v1.0 telenano-v0.1 \
-	telebt-v0.0 telebt-v0.1 \
-	telemetrum-v0.1-sky telemetrum-v0.1-sirf \
-	telelaunch-v0.1 tidongle test \
+	teledongle-v0.2 \
+	telemini-v1.0 \
+	telebt-v1.0 \
 	teleterra-v0.2 teleshield-v0.1 \
-	telefire-v0.1 \
-	spiradio-v0.1 telescience-v0.2
+	telefire-v0.1 telefire-v0.2 \
+	telemini-v2.0
 
-AVRDIRS=\
-	telescience-v0.1 telescience-pwm telepyro-v0.1 micropeak
+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
+
+ARMM0DIRS=\
+	easymini-v1.0 easymini-v1.0/flash-loader
 
-ARMDIRS=\
-	megametrum-v0.1 megadongle-v0.1 stm-bringup stm-demo telelco-v0.1
+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 arm-none-eabi-gcc),)
-	SUBDIRS += $(ARMDIRS)
+ifneq ($(strip ($HAVE_ARM_M0_CC)),yes)
+	SUBDIRS += $(ARMM0DIRS)
+endif
+
+ifeq ($(strip $(HAVE_AVR_CC)),yes)
+	SUBDIRS += $(AVRDIRS)
 endif
 
-ALLDIRS=$(SDCCDIRS) $(AVRDIRS) $(ARMDIRS)
+ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS)
 
 all: all-local all-recursive