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

diff --git a/src/Makefile b/src/Makefile
index ae231c64..ae128b7c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,6 +13,7 @@ vpath load_csv.5c kalman
 vpath matrix.5c kalman
 
 include Version
+TOPDIR=.
 include Makedefs
 
 SDCCDIRS=\
@@ -26,12 +27,13 @@ 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 \
 	telelco-v0.2 telelco-v0.2/flash-loader \
-	telescience-v0.2 telescience-v0.2/flash-loader
+	telescience-v0.2 telescience-v0.2/flash-loader \
+	teleballoon-v2.0
 
 ARMM0DIRS=\
 	easymini-v1.0 easymini-v1.0/flash-loader
@@ -39,20 +41,29 @@ ARMM0DIRS=\
 AVRDIRS=\
 	telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
 
+SUBDIRS=
+
+ifeq ($(strip $(HAVE_PDCLIB)),yes)
+PDCLIB=pdclib
+CLEAN_PDCLIB=clean-pdclib
+endif
+
 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)
@@ -87,7 +98,7 @@ uninstall:
 
 all-recursive: all-local
 
-all-local: altitude.h altitude-pa.h ao_kalman.h ao_whiten.h
+all-local: altitude.h altitude-pa.h ao_kalman.h ao_whiten.h $(PDCLIB)
 
 altitude.h: make-altitude
 	nickle $< > $@
@@ -101,5 +112,13 @@ ao_kalman.h: make-kalman kalman.5c kalman_filter.5c load_csv.5c matrix.5c
 ao_whiten.h: make-whiten
 	nickle $< > $@
 
-clean-local:
+clean-local: $(CLEAN_PDCLIB)
 	rm -f altitude.h ao_kalman.h
+
+pdclib:
+	mkdir -p $(PDCLIB_ROOT)/include $(PDCLIB_ROOT)/lib 
+	cd ../pdclib && make && make prefix=`pwd`/../pdclib-root install
+
+clean-pdclib:
+	rm -rf $(PDCLIB_ROOT)
+	cd ../pdclib && make clean