projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
conditionalize build of ARM binaries on presence of arm-none-eabi-gcc in PATH
[fw/altos]
/
altosdroid
/
Makefile.am
diff --git
a/altosdroid/Makefile.am
b/altosdroid/Makefile.am
index 2c6ffc2ceb73b863d2a5c4e221795ecb10aa0974..0732087b437cc32bbf281605658b963d8f030bd5 100644
(file)
--- a/
altosdroid/Makefile.am
+++ b/
altosdroid/Makefile.am
@@
-18,11
+18,19
@@
SRC_DIR=src/org/altusmetrum/AltosDroid
SRC=\
$(SRC_DIR)/AltosDroid.java \
SRC=\
$(SRC_DIR)/AltosDroid.java \
+ $(SRC_DIR)/TelemetryService.java \
+ $(SRC_DIR)/TelemetryServiceActivities.java \
$(SRC_DIR)/BluetoothChatService.java \
$(SRC_DIR)/DeviceListActivity.java
all: $(all_target)
$(SRC_DIR)/BluetoothChatService.java \
$(SRC_DIR)/DeviceListActivity.java
all: $(all_target)
+ALTOSLIB=bin/classes/AltosLib.jar
+
+$(ALTOSLIB):
+ mkdir -p bin/classes
+ cd bin/classes && ln -s ../../../altoslib/AltosLib.jar .
+
if ANDROID
install-release: bin/AltosDroid-release.apk
$(ADB) install -r bin/AltosDroid-release.apk
if ANDROID
install-release: bin/AltosDroid-release.apk
$(ADB) install -r bin/AltosDroid-release.apk
@@
-30,10
+38,10
@@
install-release: bin/AltosDroid-release.apk
install-debug: bin/AltosDroid-debug.apk
$(ADB) install -r bin/AltosDroid-debug.apk
install-debug: bin/AltosDroid-debug.apk
$(ADB) install -r bin/AltosDroid-debug.apk
-bin/AltosDroid-debug.apk: $(SRC)
+bin/AltosDroid-debug.apk: $(SRC)
$(ALTOSLIB)
ant debug
ant debug
-bin/AltosDroid-release.apk: $(SRC)
+bin/AltosDroid-release.apk: $(SRC)
$(ALTOSLIB)
ant release
endif
ant release
endif