X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=39f3c2b6a48439d82a08811c012ea778fa2f99d8;hb=25435dcbc6416935aa432fc090ea977bfff5d153;hp=2c6ffc2ceb73b863d2a5c4e221795ecb10aa0974;hpb=fc86ae58c3a296730fa99010cc27b8b3c2c3b780;p=fw%2Faltos

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 2c6ffc2c..39f3c2b6 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -15,14 +15,33 @@ APKBUILDER=$(SDK)/tools/apkbuilder
 ZIPALIGN=$(SDK)/tools/zipalign
 
 SRC_DIR=src/org/altusmetrum/AltosDroid
+EXT_LIBDIR=libs
+ALTOSLIB_SRCDIR=../altoslib
+ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar
+
+ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR)
 
 SRC=\
 	$(SRC_DIR)/AltosDroid.java \
-	$(SRC_DIR)/BluetoothChatService.java \
-	$(SRC_DIR)/DeviceListActivity.java
+	$(SRC_DIR)/AltosDroidPreferences.java \
+	$(SRC_DIR)/AltosVoice.java \
+	$(SRC_DIR)/TelemetryService.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)
 
+$(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
@@ -30,13 +49,26 @@ 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
+
+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