X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=59704aada74d7e7662b1fdf8f40d6702df9e9e98;hp=0473c17a85cad887e79b4757eedb67f5db37a8e2;hb=93d1cedc94358ebf5c2af537a25a242f6c19954c;hpb=8adadf6bd2ba623642675e4beafac4ac98b1916d

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 0473c17a..59704aad 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -1,5 +1,8 @@
 if ANDROID
-all_target=bin/AltosDroid-debug.apk bin/AltosDroid-release-unsigned.apk
+all_target=bin/AltosDroid-debug.apk
+if ANDROID_RELEASE
+all_target+=bin/AltosDroid-release.apk
+endif
 else
 all_target=
 endif
@@ -29,7 +32,7 @@ SUPPORT_V4=$(EXT_LIBDIR)/$(SUPPORT_V4_JAR)
 GOOGLE_PLAY_SERVICES_LIB_SRCDIR=$(SDK)/extras/google/google_play_services/libproject
 GOOGLE_PLAY_SERVICES_LIB=google-play-services_lib
 
-JAVA_SRC=$(JAVA_SRC_DIR)/*.java
+JAVA_SRC=$(JAVA_SRC_DIR)/*.java $(JAVA_SRC_DIR)/BuildInfo.java
 
 DRAWABLES=\
     $(DRAWABLE_DIR)/redled.png \
@@ -40,6 +43,8 @@ SRC=$(JAVA_SRC) $(DRAWABLES)
 
 all: $(all_target)
 
+.NOTPARALLEL:
+
 $(EXT_LIBDIR):
 	mkdir -p $(EXT_LIBDIR)
 
@@ -53,7 +58,7 @@ $(GOOGLE_PLAY_SERVICES_LIB): $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SE
 	cp -a $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SERVICES_LIB) .
 	cd $(GOOGLE_PLAY_SERVICES_LIB) && $(SDK)/tools/android update project --target $(SDK_TARGET) --path .
 
-$(JAVA_SRC_DIR)/BuildInfo.java: $(JAVA_SRC)
+$(JAVA_SRC_DIR)/BuildInfo.java: $(filter-out $(JAVA_SRC_DIR)/BuildInfo.java,$(shell echo $(JAVA_SRC)))
 	./buildinfo.sh
 
 $(DRAWABLE_DIR)/%.png: ../icon/%.png
@@ -72,18 +77,23 @@ bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICE
 bin/AltosDroid-release-unsigned.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICES_LIB)
 	ant release
 
-release: bin/AltosDroid-release-unsigned.apk
-	jarsigner -keystore release.keystore \
+bin/AltosDroid-release.apk: bin/AltosDroid-release-unsigned.apk
+	jarsigner -sigalg SHA1withDSA -digestalg SHA1 \
+	   -keystore ~/altusmetrumllc/release.keystore \
+	   -storepass:file ~/altusmetrumllc/Passphrase \
 	   -signedjar bin/AltosDroid-release-signed.apk \
 	   bin/AltosDroid-release-unsigned.apk AltosDroid
 	$(ZIPALIGN) -f 4 \
 	   bin/AltosDroid-release-signed.apk \
 	   bin/AltosDroid-release.apk
 
+release: bin/AltosDroid-release.apk
+
 clean-local: $(GOOGLE_PLAY_SERVICES_LIB)
 	ant clean
-	rm -rf $(EXT_LIBDIR)
+	rm -f $(JAVA_SRC_DIR)/BuildInfo.java
 	rm -f $(DRAWABLES)
+	rm -rf $(EXT_LIBDIR)
 	rm -rf $(GOOGLE_PLAY_SERVICES_LIB)
 
 else