summaryrefslogtreecommitdiff
path: root/navit/Makefile.am
diff options
context:
space:
mode:
authorzoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-02-25 18:38:38 +0000
committerzoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-02-25 18:38:38 +0000
commit8d40059d4bf38ab9c0ce15421fbc54b4f63e0b3c (patch)
tree2ef56e2582cff163fbbde8be04a7c57d96e7a641 /navit/Makefile.am
parent0f29be745e37af5677d31e8c7423a34fe4d370c6 (diff)
downloadnavit-svn-8d40059d4bf38ab9c0ce15421fbc54b4f63e0b3c.tar.gz
Add:Android:app icons in different sizes, fix a bug in layout, disable pedestrian plugin for now
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4245 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/Makefile.am')
-rw-r--r--navit/Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/navit/Makefile.am b/navit/Makefile.am
index e04adbeb..0ee09ae1 100644
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -73,8 +73,11 @@ if SUPPORT_ANDROID
# new android xml files for (mdpi,ldpi,hdpi)
cp $(srcdir)/navit_shipped.xml navit_android.xml.new
if [ ! -f navit.dtd ]; then cp -f $(top_srcdir)/navit/navit.dtd .; fi
-# now apply any other xslt files
- for i in $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))); do if [ "$${i%.xslt}" != "$$i" ]; then j=`basename $$i` ; if [ "$$j" != "android.xslt" ] ; then echo "Android: Applying $$i" ; @SAXON@ -snone navit_android.xml.new $(srcdir)/"$$i" >navit_android.xml.new.tmp || exit ; mv navit_android.xml.new.tmp navit_android.xml.new || exit ; fi ; fi ; done
+
+# # now apply any other xslt files (this would allow for pedestrian plugin)
+# for i in $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))); do if [ "$${i%.xslt}" != "$$i" ]; then j=`basename $$i` ; if [ "$$j" != "android.xslt" ] ; then echo "Android: Applying $$i" ; @SAXON@ -snone navit_android.xml.new $(srcdir)/"$$i" >navit_android.xml.new.tmp || exit ; mv navit_android.xml.new.tmp navit_android.xml.new || exit ; fi ; fi ; done
+# # for now disable pedestrian plugin (zoff99)
+
@SAXON@ -snone navit_android.xml.new $(srcdir)/xslt/android_mdpi.xslt >navit_android_mdpi.xml.tmp
@SAXON@ -snone navit_android.xml.new $(srcdir)/xslt/android_ldpi.xslt >navit_android_ldpi.xml.tmp
@SAXON@ -snone navit_android.xml.new $(srcdir)/xslt/android_hdpi.xslt >navit_android_hdpi.xml.tmp
@@ -155,7 +158,7 @@ apkg: apkg-all
apkg-release: apkg-all
cd android && ant release
jarsigner $$(cat ~/.keystore_args) android/bin/Navit-unsigned.apk mykey
-# zipalign -f 4 android/bin/Navit-unsigned.apk android/bin/Navit-signed.apk
+# zipalign -f 4 android/bin/Navit-unsigned.apk android/bin/Navit-unsigned-aligned.apk
else
navit_SOURCES = start.c
navit_LDADD = lib@LIBNAVIT@.la