Merge branch 'master' into telescience-v0.2

[fw/altos] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index b8828d461d65e27e9c393b6163e035c48fbd39b7..e4b110390c2cb5b6e4221136d3dc8ac60da23654 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,13 +8,13 @@ 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
 
-ifneq ($(shell which sdcc),)
-       SUBDIRS+=\
+SDCCDIRS=\
        telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
        teledongle-v0.2 teledongle-v0.1 \
        telemini-v1.0 telenano-v0.1 \
@@ -23,20 +23,31 @@ ifneq ($(shell which sdcc),)
        telelaunch-v0.1 tidongle test \
        teleterra-v0.2 teleshield-v0.1 \
        telefire-v0.1 \
-       spiradio-v0.1
+       spiradio-v0.1 telescience-v0.2
+
+AVRDIRS=\
+       telescience-v0.1 telescience-pwm telepyro-v0.1 micropeak
+
+ARMDIRS=\
+       megametrum-v0.1 megadongle-v0.1 stm-bringup stm-demo telelco-v0.1
+
+ifneq ($(shell which sdcc),)
+       SUBDIRS += $(SDCCDIRS)
 endif
 
 ifneq ($(shell which avr-gcc),)
-       SUBDIRS += telescience-v0.1 telepyro-v0.1
+       SUBDIRS += $(AVRDIRS)
 endif
 
 ifneq ($(shell which arm-none-eabi-gcc),)
-       SUBDIRS += megametrum-v0.1 stm-bringup stm-demo telelco-v0.1
+       SUBDIRS += $(ARMDIRS)
 endif
 
+ALLDIRS=$(SDCCDIRS) $(AVRDIRS) $(ARMDIRS)
+
 all: all-local all-recursive
 
-RECURSIVE_TARGETS = all-recursive clean-recursive install-recursive
+RECURSIVE_TARGETS = all-recursive install-recursive
 
 $(RECURSIVE_TARGETS):
        @target=`echo $@ | sed 's/-recursive//'`; \
@@ -45,6 +56,15 @@ $(RECURSIVE_TARGETS):
                (cd $$subdir && $(MAKE) $$target) || exit 1; \
        done
 
+ALL_RECURSIVE_TARGETS = clean-recursive
+
+$(ALL_RECURSIVE_TARGETS):
+       @target=`echo $@ | sed 's/-recursive//'`; \
+       for subdir in $(ALLDIRS); do \
+               echo "Making $$target in $$subdir"; \
+               (cd $$subdir && $(MAKE) $$target) || exit 1; \
+       done
+
 distclean:     clean
 
 clean: clean-local clean-recursive