projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.gag.com/fw/altos
[fw/altos]
/
altosdroid
/
Makefile.am
diff --git
a/altosdroid/Makefile.am
b/altosdroid/Makefile.am
index 2c6ffc2ceb73b863d2a5c4e221795ecb10aa0974..6ee984c2588f2aaa43956a16d803bff20fa9959a 100644
(file)
--- a/
altosdroid/Makefile.am
+++ b/
altosdroid/Makefile.am
@@
-15,14
+15,25
@@
APKBUILDER=$(SDK)/tools/apkbuilder
ZIPALIGN=$(SDK)/tools/zipalign
SRC_DIR=src/org/altusmetrum/AltosDroid
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=\
$(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): $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR)
+ mkdir -p $(EXT_LIBDIR)
+ cd $(EXT_LIBDIR) && ln -s $(shell echo $(EXT_LIBDIR) | sed 's|[^/]\+|..|g')/$(ALTOSLIB_SRCDIR)/$(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
+41,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