X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=36d28ca216ad1a0ef17c76bd4d3e90e4ca55fbe5;hb=82f798e7b1343a56203af2e89790f6de9ab9f98d;hp=2c6ffc2ceb73b863d2a5c4e221795ecb10aa0974;hpb=fc86ae58c3a296730fa99010cc27b8b3c2c3b780;p=fw%2Faltos

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 2c6ffc2c..36d28ca2 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -15,14 +15,26 @@ APKBUILDER=$(SDK)/tools/apkbuilder
 ZIPALIGN=$(SDK)/tools/zipalign
 
 SRC_DIR=src/org/altusmetrum/AltosDroid
+EXT_LIBDIR=libs
+ALTOSLIB_SRCDIR=../altoslib
+ALTOSLIB_JAR=AltosLib.jar
+
+ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR)
 
 SRC=\
 	$(SRC_DIR)/AltosDroid.java \
-	$(SRC_DIR)/BluetoothChatService.java \
-	$(SRC_DIR)/DeviceListActivity.java
+	$(SRC_DIR)/TelemetryService.java \
+	$(SRC_DIR)/TelemetryReader.java \
+	$(SRC_DIR)/AltosBluetooth.java \
+	$(SRC_DIR)/DeviceListActivity.java \
+	$(SRC_DIR)/Dumper.java
 
 all: $(all_target)
 
+$(ALTOSLIB): $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR)
+	mkdir -p $(EXT_LIBDIR)
+	cd $(EXT_LIBDIR) && ln -s $(shell echo $(EXT_LIBDIR) | sed 's|[^/]\+|..|g')/$(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) .
+
 if ANDROID
 install-release: bin/AltosDroid-release.apk
 	$(ADB) install -r bin/AltosDroid-release.apk
@@ -30,10 +42,10 @@ install-release: bin/AltosDroid-release.apk
 install-debug: bin/AltosDroid-debug.apk
 	$(ADB) install -r bin/AltosDroid-debug.apk
 
-bin/AltosDroid-debug.apk: $(SRC)
+bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB)
 	ant debug
 
-bin/AltosDroid-release.apk: $(SRC)
+bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB)
 	ant release
 endif