X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=3860e110b1804357e8f070e792280852aa39f175;hb=282f0451dd141db3304ab73e4020a849e59721eb;hp=0732087b437cc32bbf281605658b963d8f030bd5;hpb=392c878000e9909d37dae6342df3d6cb8f217a1b;p=fw%2Faltos

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 0732087b..3860e110 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -15,21 +15,32 @@ APKBUILDER=$(SDK)/tools/apkbuilder
 ZIPALIGN=$(SDK)/tools/zipalign
 
 SRC_DIR=src/org/altusmetrum/AltosDroid
+EXT_LIBDIR=libs
+ALTOSLIB_SRCDIR=../altoslib
+ALTOSLIB_JAR=AltosLib.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)/TelemetryServiceActivities.java \
-	$(SRC_DIR)/BluetoothChatService.java \
-	$(SRC_DIR)/DeviceListActivity.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
 
 all: $(all_target)
 
-ALTOSLIB=bin/classes/AltosLib.jar
+$(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) .
 
-$(ALTOSLIB):
-	mkdir -p bin/classes
-	cd bin/classes && ln -s ../../../altoslib/AltosLib.jar .
+$(SRC_DIR)/BuildInfo.java:
+	./buildinfo.sh
 
 if ANDROID
 install-release: bin/AltosDroid-release.apk
@@ -48,3 +59,4 @@ endif
 clean:
 	$(clean_command)
 
+.PHONY: $(SRC_DIR)/BuildInfo.java