/[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 55 Revision 56
28AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit 28AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit
29BUILT_SOURCES = version.h navit_config.h 29BUILT_SOURCES = version.h navit_config.h
30 30
31if BIN_NAVIT 31if BIN_NAVIT
32 bin_PROGRAMS = navit 32 bin_PROGRAMS = navit
33# else
34# bin_PROGRAMS = navit2
35endif 33endif
36 34
37if SHARED_LIBNAVIT 35if SHARED_LIBNAVIT
38 lib_LTLIBRARIES = lib@LIBNAVIT@.la 36 lib_LTLIBRARIES = lib@LIBNAVIT@.la
39 lib@LIBNAVIT@_la_LDFLAGS = -avoid-version @MODULE_LDFLAGS@ @NAVIT_SOCKET_LDFLAGS@ -no-undefined -Wl,--no-undefined 37 lib@LIBNAVIT@_la_LDFLAGS = -avoid-version @MODULE_LDFLAGS@ @NAVIT_SOCKET_LDFLAGS@ -no-undefined -Wl,--no-undefined
141 mkdir -p $(builddir)/android/src/ 139 mkdir -p $(builddir)/android/src/
142 if [ "$(builddir)" != "$(srcdir)" ]; then chmod -R u+w $(builddir)/android/src/; fi 140 if [ "$(builddir)" != "$(srcdir)" ]; then chmod -R u+w $(builddir)/android/src/; fi
143 if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/src/; fi 141 if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/src/; fi
144 if [ "$(builddir)" != "$(srcdir)" ]; then cp -rpf $(srcdir)/android/* $(builddir)/android; fi 142 if [ "$(builddir)" != "$(srcdir)" ]; then cp -rpf $(srcdir)/android/* $(builddir)/android; fi
145 143
146 if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/lib/; fi 144# if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/lib/; fi
147 mkdir -p $(builddir)/android/lib/ 145# mkdir -p $(builddir)/android/lib/
148 if [ "$(builddir)" != "$(srcdir)" ]; then cp -pf $(srcdir)/android/tagsoup-1.2.1.jar $(builddir)/android/lib/; fi 146# if [ "$(builddir)" != "$(srcdir)" ]; then cp -pf $(srcdir)/android/tagsoup-1.2.1.jar $(builddir)/android/lib/; fi
149 147
150 touch $(srcdir)/android/dummy.txt 148 touch $(srcdir)/android/dummy.txt
151 touch $(builddir)/android/dummy.txt 149 touch $(builddir)/android/dummy.txt
152 150
153 151
283 281
284apkg-all: all android/build.xml navit.xml 282apkg-all: all android/build.xml navit.xml
285 283
286 echo "making::apkg-all" 284 echo "making::apkg-all"
287 285
288 mkdir -p android/libs/$(b_arch) 286 mkdir -p android/nativelibs/$(b_arch)
289# cp .libs/*.so android/libs/$(b_arch)/libnavit.so
290# 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
291 287
292# remove old libs 288# remove old libs
293# ls -al android/libs/$(b_arch)/lib*.so 289# ls -al android/libs/$(b_arch)/lib*.so
294 rm -f android/libs/$(b_arch)/libgraphics_android.so 290 rm -f android/nativelibs/$(b_arch)/libgraphics_android.so
295 rm -f android/libs/$(b_arch)/libgraphics_null.so 291 rm -f android/nativelibs/$(b_arch)/libgraphics_null.so
296 rm -f android/libs/$(b_arch)/libgui_internal.so 292 rm -f android/nativelibs/$(b_arch)/libgui_internal.so
297 rm -f android/libs/$(b_arch)/libmap_binfile.so 293 rm -f android/nativelibs/$(b_arch)/libmap_binfile.so
298 rm -f android/libs/$(b_arch)/libmap_csv.so 294 rm -f android/nativelibs/$(b_arch)/libmap_csv.so
299 rm -f android/libs/$(b_arch)/libmap_filter.so 295 rm -f android/nativelibs/$(b_arch)/libmap_filter.so
300 rm -f android/libs/$(b_arch)/libmap_mg.so 296 rm -f android/nativelibs/$(b_arch)/libmap_mg.so
301 rm -f android/libs/$(b_arch)/libmap_shapefile.so 297 rm -f android/nativelibs/$(b_arch)/libmap_shapefile.so
302 rm -f android/libs/$(b_arch)/libmap_textfile.so 298 rm -f android/nativelibs/$(b_arch)/libmap_textfile.so
303 rm -f android/libs/$(b_arch)/libosd_core.so 299 rm -f android/nativelibs/$(b_arch)/libosd_core.so
304 rm -f android/libs/$(b_arch)/libspeech_android.so 300 rm -f android/nativelibs/$(b_arch)/libspeech_android.so
305 rm -f android/libs/$(b_arch)/libvehicle_android.so 301 rm -f android/nativelibs/$(b_arch)/libvehicle_android.so
306 rm -f android/libs/$(b_arch)/libvehicle_demo.so 302 rm -f android/nativelibs/$(b_arch)/libvehicle_demo.so
307 rm -f android/libs/$(b_arch)/libvehicle_file.so 303 rm -f android/nativelibs/$(b_arch)/libvehicle_file.so
308 rm -f android/libs/$(b_arch)/libvehicle_pipe.so 304 rm -f android/nativelibs/$(b_arch)/libvehicle_pipe.so
309 rm -f android/libs/$(b_arch)/libvehicle_serial.so 305 rm -f android/nativelibs/$(b_arch)/libvehicle_serial.so
310 rm -f android/libs/$(b_arch)/libvehicle_socket.so 306 rm -f android/nativelibs/$(b_arch)/libvehicle_socket.so
311 307
312 mkdir -p android/res/raw 308 mkdir -p android/res/raw
313 for i in $(shell cd ../po && echo *.mo); do cp ../po/$$i android/res/raw/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done 309 for i in $(shell cd ../po && echo *.mo); do cp ../po/$$i android/res/raw/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
314 cp navit_android_mdpi.xml android/res/raw/navitmdpi.xml 310 cp navit_android_mdpi.xml android/res/raw/navitmdpi.xml
315 cp navit_android_ldpi.xml android/res/raw/navitldpi.xml 311 cp navit_android_ldpi.xml android/res/raw/navitldpi.xml
316 cp navit_android_hdpi.xml android/res/raw/navithdpi.xml 312 cp navit_android_hdpi.xml android/res/raw/navithdpi.xml
317 313
318# cleanup svn dirs, they should never be in build dir 314# cleanup svn dirs, they should never be in build dir
319 if [ "$(builddir)" != "$(srcdir)" ]; then find $(builddir) -type d -name '\.svn' -exec rm -Rf {} \; ; fi; echo "ignore the find errors!!" 315 if [ "$(builddir)" != "$(srcdir)" ]; then find $(builddir) -type d -name '\.svn' -exec rm -Rf {} \; ; fi; echo "ignore the find errors!!"
320 316
321 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/libs/$(b_arch) ; fi 317 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/nativelibs/$(b_arch) ; fi
322 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then install -p $(NDK)/prebuilt/android-arm/gdbserver/gdbserver android/libs/$(b_arch)/gdbserver ; fi 318 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then install -p $(NDK)/prebuilt/android-arm/gdbserver/gdbserver android/nativelibs/$(b_arch)/gdbserver ; fi
323 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/libs/$(b_arch) ; fi 319 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/nativelibs/$(b_arch) ; fi
324 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/obj/local/$(b_arch) ; fi 320 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/obj/local/$(b_arch) ; fi
325 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then cp android/libs/$(b_arch)/*.so android/obj/local/$(b_arch)/ ; fi 321 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then cp android/nativelibs/$(b_arch)/*.so android/obj/local/$(b_arch)/ ; fi
326 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then echo "set solib-search-path $(builddir)/obj/local/$(b_arch)" > android/libs/$(b_arch)/gdb.setup ; fi 322 if [ "$(DO_RELEASE_BUILD)" != "1" ]; then echo "set solib-search-path $(builddir)/obj/local/$(b_arch)" > android/nativelibs/$(b_arch)/gdb.setup ; fi
327 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 323 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/nativelibs/$(b_arch)/gdb.setup ; fi
328
329# strip libs if release build is selected
330# if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; arm-linux-androideabi-strip --strip-unneeded $(builddir)/android/libs/armeabi/* ; echo "done" ; fi
331# if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; arm-linux-androideabi-strip --strip-unneeded $(builddir)/android/libs/armeabi-v7a/* ; echo "done" ; fi
332# if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; /home/navit/_navit_develop/_need/NDK/_unpack/android-ndk-r5c/toolchains/x86-4.8/prebuilt/linux-x86/bin/i686-linux-android-strip --strip-unneeded $(builddir)/android/libs/x86/* ; echo "done" ; fi
333 324
334 325
335apkg: apkg-all 326apkg: apkg-all
336 echo "making::apkg" 327 echo "making::apkg"
337 touch $(srcdir)/android/dummy.txt 328 touch $(srcdir)/android/dummy.txt
344 touch $(builddir)/android/dummy.txt 335 touch $(builddir)/android/dummy.txt
345 cd android && echo "release" 336 cd android && echo "release"
346else 337else
347navit_SOURCES = start.c 338navit_SOURCES = start.c
348navit_LDADD = lib@LIBNAVIT@.la 339navit_LDADD = lib@LIBNAVIT@.la
349
350endif
351
352
353
354if SUPPORT_ANDROID
355
356# navit2_SOURCES = navit2.c
357# navit2_LDADD = lib@LIBNAVIT@.la
358# navit2_LDADD += @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @CRYPTO_LIBS@ @INTLLIBS@
359# navit2_LDFLAGS = -static -lc
360# navit2_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) -o navit2 -lc --sysroot=$(NDK)/platforms/android-$(AND_API_LEVEL_C)/arch-arm
361 340
362endif 341endif
363 342
364 343
365if EVENT_GLIB 344if EVENT_GLIB

Legend:
Removed from v.55  
changed lines
  Added in v.56

   
Visit the ZANavi Wiki