Merge remote-tracking branch 'mjb/master'

[fw/altos] / altosdroid / Makefile.am

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 3b5abfc4c3dde1884e59121c6f3e4e133bb2c309..39f3c2b6a48439d82a08811c012ea778fa2f99d8 100644 (file)
--- 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)
 
@@ -65,7 +65,10 @@ sign:
 
 endif
 
-clean:
+clean: clean-local
        $(clean_command)
 
+clean-local:
+       rm -rf $(EXT_LIBDIR)
+
 .PHONY: $(SRC_DIR)/BuildInfo.java