X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2FMakefile.am;h=cc74b7a85395b817e653792cdaec4d048ebe9cd0;hb=41ede0267250a1d3b26e19cc9dd78f32609f7f0f;hp=96831b722ba7955a87242bf562e5823df8965f37;hpb=3fe5c2f9fc01258d45c20070e9874d76bc6c8c07;p=fw%2Faltos

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 96831b72..cc74b7a8 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -17,7 +17,7 @@ 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)
 
@@ -30,6 +30,7 @@ SRC=\
 	$(SRC_DIR)/TelemetryLogger.java \
 	$(SRC_DIR)/AltosBluetooth.java \
 	$(SRC_DIR)/DeviceListActivity.java \
+	$(SRC_DIR)/BuildInfo.java \
 	$(SRC_DIR)/Dumper.java
 
 all: $(all_target)
@@ -38,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
@@ -52,6 +56,10 @@ bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB)
 	ant release
 endif
 
-clean:
+clean: clean-local
 	$(clean_command)
 
+clean-local:
+	rm -rf $(EXT_LIBDIR)
+
+.PHONY: $(SRC_DIR)/BuildInfo.java