altosdroid: adjust Makefile rules

[fw/altos] / altosdroid / Makefile.am

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