/[zanavi_public1]/navit/navit/Makefile.am
ZANavi

Diff of /navit/navit/Makefile.am

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 30 Revision 31
56 android.h data.h data_window.h data_window_int.h debug.h destination.h draw_info.h endianess.h event.h \ 56 android.h data.h data_window.h data_window_int.h debug.h destination.h draw_info.h endianess.h event.h \
57 file.h graphics.h gtkext.h gui.h item.h item_def.h keys.h log.h layer.h layout.h linguistics.h main.h map-share.h map.h\ 57 file.h graphics.h gtkext.h gui.h item.h item_def.h keys.h log.h layer.h layout.h linguistics.h main.h map-share.h map.h\
58 map_data.h mapset.h maptype.h menu.h messages.h navigation.h navit.h osd.h \ 58 map_data.h mapset.h maptype.h menu.h messages.h navigation.h navit.h osd.h \
59 param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h roadprofile.h search.h speech.h start_real.h \ 59 param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h roadprofile.h search.h speech.h start_real.h \
60 transform.h track.h types.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \ 60 transform.h track.h types.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \
61 navit_nls.h sunriset.c sunriset.h glib_slice.h 61 navit_nls.h sunriset.c sunriset.h glib_slice.h maptool/miniz.c
62 62
63XSLTS=@XSLTS@ 63XSLTS=@XSLTS@
64navit.xml: navit_shipped.xml $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))) navit_android_xml 64navit.xml: navit_shipped.xml $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))) navit_android_xml
65 cp $< navit.xml.new 65 cp $< navit.xml.new
66 if [ ! -f navit.dtd ]; then cp -f $(top_srcdir)/navit/navit.dtd .; fi 66 if [ ! -f navit.dtd ]; then cp -f $(top_srcdir)/navit/navit.dtd .; fi
98 navit_SOURCES = 98 navit_SOURCES =
99 navit_LDADD = 99 navit_LDADD =
100 100
101v_int = $$(cat $(srcdir)/android/Android_Market_Version_int.txt|grep v_int|cut -d ":" -f 2) 101v_int = $$(cat $(srcdir)/android/Android_Market_Version_int.txt|grep v_int|cut -d ":" -f 2)
102v_name = "1.0.0-"$$(LANG=C svnversion $(top_srcdir) 2> /dev/null|tr -d ":A-Z" 2> /dev/null) 102v_name = "1.0.0-"$$(LANG=C svnversion $(top_srcdir) 2> /dev/null|tr -d ":A-Z" 2> /dev/null)
103b_arch = $(shell if [ "$(DO_X86_BUILD)" == "1" ]; then echo "x86";else echo "armeabi"; fi)
104
103 105
104android/AndroidManifest.xml: android/AndroidManifest.xml.in 106android/AndroidManifest.xml: android/AndroidManifest.xml.in
105 mkdir -p $(builddir)/android 107 mkdir -p $(builddir)/android
106 mkdir -p $(builddir)/android/res2/drawable-hdpi 108 mkdir -p $(builddir)/android/res2/drawable-hdpi
107 mkdir -p $(builddir)/android/res2/drawable-mdpi 109 mkdir -p $(builddir)/android/res2/drawable-mdpi
124 touch $(srcdir)/android/dummy.txt 126 touch $(srcdir)/android/dummy.txt
125 touch $(builddir)/android/dummy.txt 127 touch $(builddir)/android/dummy.txt
126 android update project -t @ANDROID_PROJECT@ -p android 128 android update project -t @ANDROID_PROJECT@ -p android
127 129
128apkg-all: all android/build.xml navit.xml 130apkg-all: all android/build.xml navit.xml
131
129 mkdir -p android/libs/armeabi 132 mkdir -p android/libs/$(b_arch)
130 cp .libs/*.so android/libs/armeabi/libnavit.so 133 cp .libs/*.so android/libs/$(b_arch)/libnavit.so
131 for i in */*/.libs/*.so ; do sed 's&lib_data_data_com\.zoffcc\.applications\.zanavi_lib_&/data/data/com.zoffcc.applications.zanavi/lib/lib&' <$$i >android/libs/armeabi/$$(basename $$i); done 134 for i in */*/.libs/*.so ; do sed 's&lib_data_data_com\.zoffcc\.applications\.zanavi_lib_&/data/data/com.zoffcc.applications.zanavi/lib/lib&' <$$i >android/libs/$(b_arch)/$$(basename $$i); done
132 135
133 mkdir -p android/res/drawable-ldpi 136 mkdir -p android/res/drawable-ldpi
134 mkdir -p android/res/drawable-mdpi 137 mkdir -p android/res/drawable-mdpi
135 mkdir -p android/res/drawable-hdpi 138 mkdir -p android/res/drawable-hdpi
136 if [ "$(DO_PNG_BUILD)" == "1" ]; then for i in $(shell cd $(srcdir)/xpm && echo *.xpm); do convert $(srcdir)/xpm/$$i android/res/drawable-mdpi/$${i%.xpm}.png; done ; fi 139 if [ "$(DO_PNG_BUILD)" == "1" ]; then for i in $(shell cd $(srcdir)/xpm && echo *.xpm); do convert $(srcdir)/xpm/$$i android/res/drawable-mdpi/$${i%.xpm}.png; done ; fi
183 cp navit_android_hdpi.xml android/res/raw/navithdpi.xml 186 cp navit_android_hdpi.xml android/res/raw/navithdpi.xml
184 187
185# cleanup svn dirs, they should never be in build dir 188# cleanup svn dirs, they should never be in build dir
186 if [ "$(builddir)" != "$(srcdir)" ]; then find $(builddir) -type d -name '\.svn' -exec rm -Rf {} \; ; fi; echo "ignore the find errors!!" 189 if [ "$(builddir)" != "$(srcdir)" ]; then find $(builddir) -type d -name '\.svn' -exec rm -Rf {} \; ; fi; echo "ignore the find errors!!"
187 190
188 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/libs/armeabi ; fi 191 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/libs/$(b_arch) ; fi
189 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then install -p $(NDK)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver android/libs/armeabi/gdbserver ; fi 192 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then install -p $(NDK)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver android/libs/$(b_arch)/gdbserver ; fi
190 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/libs/armeabi ; fi 193 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/libs/$(b_arch) ; fi
191 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/obj/local/armeabi ; fi 194 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/obj/local/$(b_arch) ; fi
192 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then cp android/libs/armeabi/*.so android/obj/local/armeabi/ ; fi 195 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then cp android/libs/$(b_arch)/*.so android/obj/local/$(b_arch)/ ; fi
193 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then echo "set solib-search-path $(builddir)/obj/local/armeabi" > android/libs/armeabi/gdb.setup ; fi 196 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then echo "set solib-search-path $(builddir)/obj/local/$(b_arch)" > android/libs/$(b_arch)/gdb.setup ; fi
194 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then echo "directory $(NDK)/platforms/android-""$(AND_API_LEVEL_C)""/arch-arm/usr/include $(NDK)/sources/cxx-stl/system" >> android/libs/armeabi/gdb.setup ; fi 197 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then echo "directory $(NDK)/platforms/android-""$(AND_API_LEVEL_C)""/arch-arm/usr/include $(NDK)/sources/cxx-stl/system" >> android/libs/$(b_arch)/gdb.setup ; fi
195 198
196# strip libs if release build is selected 199# strip libs if release build is selected
197 if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; arm-linux-androideabi-strip --strip-unneeded $(builddir)/android/libs/armeabi/* ; echo "done" ; fi 200 if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; arm-linux-androideabi-strip --strip-unneeded $(builddir)/android/libs/armeabi/* ; echo "done" ; fi
201 if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; i686-android-linux-strip --strip-unneeded $(builddir)/android/libs/x86/* ; echo "done" ; fi
198 202
199 203
200apkg: apkg-all 204apkg: apkg-all
201 touch $(srcdir)/android/dummy.txt 205 touch $(srcdir)/android/dummy.txt
202 touch $(builddir)/android/dummy.txt 206 touch $(builddir)/android/dummy.txt

Legend:
Removed from v.30  
changed lines
  Added in v.31

   
Visit the ZANavi Wiki