X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2FMakefile;h=4e8b3c20c6a94562676cd67fffb28606b5b441b8;hp=2ba59d9454914459f5cc573191b9c8f5a4446d84;hb=f8567a7be7ccd5dcc57ab65e63efe45e62008127;hpb=9c200c3bc742b4dd1a7e28bfce9d5b27e833aae5

diff --git a/src/Makefile b/src/Makefile
index 2ba59d94..4e8b3c20 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,16 +13,16 @@ vpath load_csv.5c kalman
 vpath matrix.5c kalman
 
 include Version
+TOPDIR=.
 include Makedefs
 
 SDCCDIRS=\
 	telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
 	teledongle-v0.2 \
-	telemini-v1.0 \
+	telemini-v1.0 telemini-v2.0 \
 	telebt-v1.0 \
 	teleterra-v0.2 teleshield-v0.1 \
-	telefire-v0.1 telefire-v0.2 \
-	telemini-v2.0
+	telefire-v0.1 telefire-v0.2
 
 ARMM3DIRS=\
 	telemega-v0.1 telemega-v0.1/flash-loader \
@@ -30,9 +30,10 @@ ARMM3DIRS=\
 	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 \
+	telegps-v1.0 telegps-v1.0/flash-loader \
 	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
@@ -44,6 +45,7 @@ SUBDIRS=
 
 ifeq ($(strip $(HAVE_PDCLIB)),yes)
 PDCLIB=pdclib
+CLEAN_PDCLIB=clean-pdclib
 endif
 
 ifeq ($(strip $(HAVE_SDCC)),yes)
@@ -110,8 +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:
-	cd ../pdclib && make && make prefix=`pwd`/opt install
+	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