X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2FMakefile.am;h=9ca2453177642b34004b34ac9caf128d43495e7c;hb=b7dc6045892b33b04ec7c27bdc940b4d3e1b9cbf;hp=6ee984c2588f2aaa43956a16d803bff20fa9959a;hpb=bd02349111ae0f39b320e6a10a330051ddc39fdf;p=fw%2Faltos

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 6ee984c2..9ca24531 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -17,22 +17,22 @@ 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)/TelemetryService.java \
-	$(SRC_DIR)/TelemetryServiceActivities.java \
-	$(SRC_DIR)/BluetoothChatService.java \
-	$(SRC_DIR)/DeviceListActivity.java
+SRC=$(SRC_DIR)/*.java
 
 all: $(all_target)
 
-$(ALTOSLIB): $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR)
+$(EXT_LIBDIR):
 	mkdir -p $(EXT_LIBDIR)
-	cd $(EXT_LIBDIR) && ln -s $(shell echo $(EXT_LIBDIR) | sed 's|[^/]\+|..|g')/$(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) .
+
+$(ALTOSLIB): $(EXT_LIBDIR) $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR)
+	cd $(EXT_LIBDIR) && ln -sf $(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
@@ -46,8 +46,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)
+