X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=7716b49bacd9a8c23b272fed7aa241fe3679a2a9;hp=6ee984c2588f2aaa43956a16d803bff20fa9959a;hb=1c9a3a5080ca0e21f45c2b7ea889793645796751;hpb=599e28b2242c79bdd0960ef16e580e51a2fa3795

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 6ee984c2..7716b49b 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: $(SRC)
+	./buildinfo.sh
+
 if ANDROID
 install-release: bin/AltosDroid-release.apk
 	$(ADB) install -r bin/AltosDroid-release.apk
@@ -46,8 +54,20 @@ 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)
+