From 17c43dbb3affea6ea6b712bfa47ca881c17882b2 Mon Sep 17 00:00:00 2001
From: Christopher Young <cyoung@gmail.com>
Date: Tue, 29 Dec 2015 19:50:33 -0500
Subject: [PATCH] Update build process to use new dump1090.

Fixes #171.
---
 Makefile                    | 22 ++++++++++++++++++++--
 image/spindle/wheezy-stage4 | 10 ----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 692c641b8..017a51c70 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,26 @@ $(if $(GOROOT),,$(error GOROOT is not set!))
 endif
 
 all:
+	make xdump978
+	make xdump1090
+	make xlinux-mpu9150
+	make xgen_gdl90
+
+xgen_gdl90:
+	go get -t -d -v ./main ./test ./linux-mpu9150/mpu ./godump978 ./mpu6050 ./uatparse
+	go build $(BUILDINFO) main/gen_gdl90.go main/traffic.go main/ry835ai.go main/network.go main/managementinterface.go main/sdr.go main/uibroadcast.go
+
+xdump1090:
+	git submodule update --init
+	cd dump1090 && make
+
+xdump978:
 	cd dump978 && make lib
 	sudo cp -f ./libdump978.so /usr/lib/libdump978.so
+
+xlinux-mpu9150:
 	git submodule update --init
 	cd linux-mpu9150 && make -f Makefile-native-shared
-	go get -t -d -v ./main ./test ./linux-mpu9150/mpu ./godump978 ./mpu6050 ./uatparse
-	go build $(BUILDINFO) main/gen_gdl90.go main/traffic.go main/ry835ai.go main/network.go main/managementinterface.go main/sdr.go main/uibroadcast.go
 
 .PHONY: test
 test:
@@ -61,6 +75,10 @@ install:
 	ln -sf /etc/init.d/stratux /etc/rc2.d/S01stratux
 	ln -sf /etc/init.d/stratux /etc/rc6.d/K01stratux
 	make www
+	cp -f dump1090/dump1090 /usr/bin/
 
 clean:
 	rm -f gen_gdl90 libdump978.so
+	cd dump1090 && make clean
+	cd dump978 && make clean
+	rm -f linux-mpu9150/*.o linux-mpu9150/*.so
diff --git a/image/spindle/wheezy-stage4 b/image/spindle/wheezy-stage4
index 77a89ca36..66b2a902b 100755
--- a/image/spindle/wheezy-stage4
+++ b/image/spindle/wheezy-stage4
@@ -119,16 +119,6 @@ make install
 ldconfig
 EOF
 
-echo " - dump1090"
-  ssh_in_to_qemu chroot /mnt sh -l -ex - <<\EOF
-cd /root
-rm -rf dump1090
-git clone https://github.com/antirez/dump1090
-cd dump1090
-make
-cp dump1090 /usr/bin/
-EOF
-
 echo " - Stratux"
 
 scp_in_to_qemu /root/spindle/gen_gdl90 /tmp/gen_gdl90