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 ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosdroid
/
Makefile.am
diff --git
a/altosdroid/Makefile.am
b/altosdroid/Makefile.am
index 557a572208fc4e8d961fd6a4a74d57a4a8c688ad..36d28ca216ad1a0ef17c76bd4d3e90e4ca55fbe5 100644
(file)
--- a/
altosdroid/Makefile.am
+++ b/
altosdroid/Makefile.am
@@
-15,19
+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)/BluetoothChatService.java \
- $(SRC_DIR)/DeviceListActivity.java
+ $(SRC_DIR)/TelemetryService.java \
+ $(SRC_DIR)/TelemetryReader.java \
+ $(SRC_DIR)/AltosBluetooth.java \
+ $(SRC_DIR)/DeviceListActivity.java \
+ $(SRC_DIR)/Dumper.java
all: $(all_target)
all: $(all_target)
-ALTOSLIB=bin/classes/AltosLib.jar
-
-$(ALTOSLIB):
- mkdir -p bin/classes
- cd bin/classes && ln -s ../../../altoslib/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) .
if ANDROID
install-release: bin/AltosDroid-release.apk
if ANDROID
install-release: bin/AltosDroid-release.apk