projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: minor whitespace cleanup
[fw/altos]
/
altosdroid
/
Makefile.am
diff --git
a/altosdroid/Makefile.am
b/altosdroid/Makefile.am
index 0732087b437cc32bbf281605658b963d8f030bd5..39f3c2b6a48439d82a08811c012ea778fa2f99d8 100644
(file)
--- 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
ZIPALIGN=$(SDK)/tools/zipalign
SRC_DIR=src/org/altusmetrum/AltosDroid
+EXT_LIBDIR=libs
+ALTOSLIB_SRCDIR=../altoslib
+ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar
+
+ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR)
SRC=\
$(SRC_DIR)/AltosDroid.java \
SRC=\
$(SRC_DIR)/AltosDroid.java \
+ $(SRC_DIR)/AltosDroidPreferences.java \
+ $(SRC_DIR)/AltosVoice.java \
$(SRC_DIR)/TelemetryService.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)
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
if ANDROID
install-release: bin/AltosDroid-release.apk
@@
-43,8
+54,21
@@
bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB)
bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB)
ant release
bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB)
ant release
+
+sign:
+ jarsigner -keystore release.keystore \
+ -signedjar bin/AltosDroid-release-signed.apk \
+ bin/AltosDroid-release-unsigned.apk AltosDroid
+ $(SDK)/tools/zipalign -f 4 \
+ bin/AltosDroid-release-signed.apk \
+ bin/AltosDroid-release.apk
+
endif
endif
-clean:
+clean:
clean-local
$(clean_command)
$(clean_command)
+clean-local:
+ rm -rf $(EXT_LIBDIR)
+
+.PHONY: $(SRC_DIR)/BuildInfo.java