diff options
| author | zoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-02 10:53:44 +0000 |
|---|---|---|
| committer | zoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-02 10:53:44 +0000 |
| commit | a1103f2668a83a0a583fc7a8bb493d309b133ac5 (patch) | |
| tree | c81cb9d8816f987dd8802a1cb19a6bb8828af027 /navit/Makefile.am | |
| parent | e36f7ae325eecead6465956b369ea3f6b8ec4df2 (diff) | |
| download | navit-a1103f2668a83a0a583fc7a8bb493d309b133ac5.tar.gz | |
Fix:Core:fixed bug in makefile for android, java files should now be always copied over from srcdir
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4276 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/Makefile.am')
| -rw-r--r-- | navit/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/navit/Makefile.am b/navit/Makefile.am index 9d86c52b8..7a9676745 100644 --- a/navit/Makefile.am +++ b/navit/Makefile.am @@ -116,8 +116,9 @@ android/build.xml: android/AndroidManifest.xml android/dummy.txt mkdir -p $(builddir)/android/src/ if [ "$(builddir)" != "$(srcdir)" ]; then chmod -R u+w $(builddir)/android/src/; fi if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/src/; fi - touch android/dummy.txt if [ "$(builddir)" != "$(srcdir)" ]; then cp -rpf $(srcdir)/android/* $(builddir)/android; fi + touch $(srcdir)/android/dummy.txt + touch $(builddir)/android/dummy.txt android update project -t @ANDROID_PROJECT@ -p android apkg-all: all android/build.xml navit.xml @@ -156,9 +157,13 @@ apkg-all: all android/build.xml navit.xml cp navit_android_hdpi.xml android/res/raw/navithdpi.xml apkg: apkg-all + touch $(srcdir)/android/dummy.txt + touch $(builddir)/android/dummy.txt cd android && ant debug apkg-release: apkg-all + touch $(srcdir)/android/dummy.txt + touch $(builddir)/android/dummy.txt 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-unsigned-aligned.apk |