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

diff --git a/src/Makefile b/src/Makefile
index ae231c64..0ca101c0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,10 +26,10 @@ 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
 
@@ -39,20 +39,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 +96,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 +110,11 @@ 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:
+	cd ../pdclib && mkdir -p opt/include opt/lib && make && make prefix=`pwd`/opt install
+
+clean-pdclib:
+	cd ../pdclib && make clean && rm -rf opt
\ No newline at end of file