X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=39f3c2b6a48439d82a08811c012ea778fa2f99d8;hb=5560148ffea1a718a303d999a0f8a625deceef23;hp=6ee984c2588f2aaa43956a16d803bff20fa9959a;hpb=5ed88fb72c3e3ecf3333c700d838667db71cfbdc;p=fw%2Faltos

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 6ee984c2..39f3c2b6 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -17,16 +17,21 @@ ZIPALIGN=$(SDK)/tools/zipalign
 SRC_DIR=src/org/altusmetrum/AltosDroid
 EXT_LIBDIR=libs
 ALTOSLIB_SRCDIR=../altoslib
-ALTOSLIB_JAR=AltosLib.jar
+ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
 ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR)
 
 SRC=\
 	$(SRC_DIR)/AltosDroid.java \
+	$(SRC_DIR)/AltosDroidPreferences.java \
+	$(SRC_DIR)/AltosVoice.java \
 	$(SRC_DIR)/TelemetryService.java \
-	$(SRC_DIR)/TelemetryServiceActivities.java \
-	$(SRC_DIR)/BluetoothChatService.java \
-	$(SRC_DIR)/DeviceListActivity.java
+	$(SRC_DIR)/TelemetryReader.java \
+	$(SRC_DIR)/TelemetryLogger.java \
+	$(SRC_DIR)/AltosBluetooth.java \
+	$(SRC_DIR)/DeviceListActivity.java \
+	$(SRC_DIR)/BuildInfo.java \
+	$(SRC_DIR)/Dumper.java
 
 all: $(all_target)
 
@@ -34,6 +39,9 @@ $(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) .
 
+$(SRC_DIR)/BuildInfo.java:
+	./buildinfo.sh
+
 if ANDROID
 install-release: bin/AltosDroid-release.apk
 	$(ADB) install -r bin/AltosDroid-release.apk
@@ -46,8 +54,21 @@ bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB)
 
 bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB)
 	ant release
+
+sign:
+	jarsigner -keystore release.keystore \
+	   -signedjar bin/AltosDroid-release-signed.apk \
+	   bin/AltosDroid-release-unsigned.apk AltosDroid
+	$(SDK)/tools/zipalign -f 4 \
+	   bin/AltosDroid-release-signed.apk \
+	   bin/AltosDroid-release.apk
+
 endif
 
-clean:
+clean: clean-local
 	$(clean_command)
 
+clean-local:
+	rm -rf $(EXT_LIBDIR)
+
+.PHONY: $(SRC_DIR)/BuildInfo.java