projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: fix side-to-side scrolling in map tab
[fw/altos]
/
altosdroid
/
Makefile.am
diff --git
a/altosdroid/Makefile.am
b/altosdroid/Makefile.am
index daa649631ce8b8e9757e7b1f2c3e163aaf1d3642..3dbabdd7361603595e11c9becdb538dd077a528d 100644
(file)
--- a/
altosdroid/Makefile.am
+++ b/
altosdroid/Makefile.am
@@
-13,8
+13,9
@@
AAPT=$(SDK)/platform-tools/aapt
APKBUILDER=$(SDK)/tools/apkbuilder
ZIPALIGN=$(SDK)/tools/zipalign
APKBUILDER=$(SDK)/tools/apkbuilder
ZIPALIGN=$(SDK)/tools/zipalign
-SRC_DIR=src/org/altusmetrum/AltosDroid
+
JAVA_
SRC_DIR=src/org/altusmetrum/AltosDroid
EXT_LIBDIR=libs
EXT_LIBDIR=libs
+DRAWABLE_DIR=res/drawable
ALTOSLIB_SRCDIR=../altoslib
ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar
ALTOSLIB_SRCDIR=../altoslib
ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar
@@
-28,7
+29,14
@@
SUPPORT_V4=$(EXT_LIBDIR)/$(SUPPORT_V4_JAR)
GOOGLE_PLAY_SERVICES_LIB_SRCDIR=$(SDK)/extras/google/google_play_services/libproject
GOOGLE_PLAY_SERVICES_LIB=google-play-services_lib
GOOGLE_PLAY_SERVICES_LIB_SRCDIR=$(SDK)/extras/google/google_play_services/libproject
GOOGLE_PLAY_SERVICES_LIB=google-play-services_lib
-SRC=$(SRC_DIR)/*.java
+JAVA_SRC=$(JAVA_SRC_DIR)/*.java
+
+DRAWABLES=\
+ $(DRAWABLE_DIR)/redled.png \
+ $(DRAWABLE_DIR)/greenled.png \
+ $(DRAWABLE_DIR)/grayled.png
+
+SRC=$(JAVA_SRC) $(DRAWABLES)
all: $(all_target)
all: $(all_target)
@@
-45,9
+53,12
@@
$(GOOGLE_PLAY_SERVICES_LIB): $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SE
cp -a $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SERVICES_LIB) .
cd $(GOOGLE_PLAY_SERVICES_LIB) && $(SDK)/tools/android update project --target $(SDK_TARGET) --path .
cp -a $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SERVICES_LIB) .
cd $(GOOGLE_PLAY_SERVICES_LIB) && $(SDK)/tools/android update project --target $(SDK_TARGET) --path .
-$(
SRC_DIR)/BuildInfo.java: $(
SRC)
+$(
JAVA_SRC_DIR)/BuildInfo.java: $(JAVA_
SRC)
./buildinfo.sh
./buildinfo.sh
+$(DRAWABLE_DIR)/%.png: ../icon/%.png
+ cd $(DRAWABLE_DIR) && ln -sf $(shell echo $(DRAWABLE_DIR) | sed 's|[^/]\+|..|g')/$< .
+
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
@@
-61,17
+72,18
@@
bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICE
bin/AltosDroid-release-unsigned.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICES_LIB)
ant release
bin/AltosDroid-release-unsigned.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICES_LIB)
ant release
-sign:
+release: bin/AltosDroid-release-unsigned.apk
jarsigner -keystore release.keystore \
-signedjar bin/AltosDroid-release-signed.apk \
bin/AltosDroid-release-unsigned.apk AltosDroid
jarsigner -keystore release.keystore \
-signedjar bin/AltosDroid-release-signed.apk \
bin/AltosDroid-release-unsigned.apk AltosDroid
- $(
SDK)/tools/zipalign
-f 4 \
+ $(
ZIPALIGN)
-f 4 \
bin/AltosDroid-release-signed.apk \
bin/AltosDroid-release.apk
clean: $(GOOGLE_PLAY_SERVICES_LIB)
ant clean
rm -rf $(EXT_LIBDIR)
bin/AltosDroid-release-signed.apk \
bin/AltosDroid-release.apk
clean: $(GOOGLE_PLAY_SERVICES_LIB)
ant clean
rm -rf $(EXT_LIBDIR)
+ rm -f $(DRAWABLES)
rm -rf $(GOOGLE_PLAY_SERVICES_LIB)
else
rm -rf $(GOOGLE_PLAY_SERVICES_LIB)
else