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

Diff of /navit/navit/Makefile.in

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

Revision 55 Revision 56
… …
54@SUPPORT_ANDROID_TRUE@ map/csv/quadtree.c \ 54@SUPPORT_ANDROID_TRUE@ map/csv/quadtree.c \
55@SUPPORT_ANDROID_TRUE@ map/textfile/textfile.c \ 55@SUPPORT_ANDROID_TRUE@ map/textfile/textfile.c \
56@SUPPORT_ANDROID_TRUE@ osd/core/osd_core.c \ 56@SUPPORT_ANDROID_TRUE@ osd/core/osd_core.c \
57@SUPPORT_ANDROID_TRUE@ speech/android/speech_android.c \ 57@SUPPORT_ANDROID_TRUE@ speech/android/speech_android.c \
58@SUPPORT_ANDROID_TRUE@ android.c 58@SUPPORT_ANDROID_TRUE@ android.c
59
60# navit2_SOURCES = navit2.c
61# navit2_LDADD = lib@LIBNAVIT@.la
62# navit2_LDADD += @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @CRYPTO_LIBS@ @INTLLIBS@
63# navit2_LDFLAGS = -static -lc
64# navit2_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) -o navit2 -lc --sysroot=$(NDK)/platforms/android-$(AND_API_LEVEL_C)/arch-arm
65@EVENT_GLIB_TRUE@am__append_8 = event_glib.c 59@EVENT_GLIB_TRUE@am__append_8 = event_glib.c
66@PLUGINS_FALSE@am__append_9 = builtin.c 60@PLUGINS_FALSE@am__append_9 = builtin.c
67@PLUGINS_FALSE@am__append_10 = $(MODULES) 61@PLUGINS_FALSE@am__append_10 = $(MODULES)
68@SUPPORT_WIN32_TRUE@am__append_11 = resource.rsc 62@SUPPORT_WIN32_TRUE@am__append_11 = resource.rsc
69@SUPPORT_WIN32CE_TRUE@@SUPPORT_WIN32_TRUE@am__append_12 = -lcommctrl -Lsupport/libc 63@SUPPORT_WIN32CE_TRUE@@SUPPORT_WIN32_TRUE@am__append_12 = -lcommctrl -Lsupport/libc
… …
513 $(am__append_3) $(am__append_4) $(am__append_5) 507 $(am__append_3) $(am__append_4) $(am__append_5)
514DIST_SUBDIRS = autoload binding map maptool fib-1.1 font fonts gui graphics osd plugin speech vehicle support maps 508DIST_SUBDIRS = autoload binding map maptool fib-1.1 font fonts gui graphics osd plugin speech vehicle support maps
515MODULES = $(wildcard $(top_builddir)/navit/binding/*/*.la $(top_builddir)/navit/font/*/*.la $(top_builddir)/navit/graphics/*/*.la $(top_builddir)/navit/gui/*/*.la $(top_builddir)/navit/map/*/*.la $(top_builddir)/navit/osd/*/*.la $(top_builddir)/navit/speech/*/*.la $(top_builddir)/navit/vehicle/*/*.la) 509MODULES = $(wildcard $(top_builddir)/navit/binding/*/*.la $(top_builddir)/navit/font/*/*.la $(top_builddir)/navit/graphics/*/*.la $(top_builddir)/navit/gui/*/*.la $(top_builddir)/navit/map/*/*.la $(top_builddir)/navit/osd/*/*.la $(top_builddir)/navit/speech/*/*.la $(top_builddir)/navit/vehicle/*/*.la)
516AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit 510AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit
517BUILT_SOURCES = version.h navit_config.h 511BUILT_SOURCES = version.h navit_config.h
518# else
519# bin_PROGRAMS = navit2
520@SHARED_LIBNAVIT_TRUE@lib_LTLIBRARIES = lib@LIBNAVIT@.la 512@SHARED_LIBNAVIT_TRUE@lib_LTLIBRARIES = lib@LIBNAVIT@.la
521@SHARED_LIBNAVIT_TRUE@lib@LIBNAVIT@_la_LDFLAGS = -avoid-version @MODULE_LDFLAGS@ @NAVIT_SOCKET_LDFLAGS@ -no-undefined -Wl,--no-undefined 513@SHARED_LIBNAVIT_TRUE@lib@LIBNAVIT@_la_LDFLAGS = -avoid-version @MODULE_LDFLAGS@ @NAVIT_SOCKET_LDFLAGS@ -no-undefined -Wl,--no-undefined
522@SHARED_LIBNAVIT_FALSE@noinst_LTLIBRARIES = lib@LIBNAVIT@.la 514@SHARED_LIBNAVIT_FALSE@noinst_LTLIBRARIES = lib@LIBNAVIT@.la
523lib@LIBNAVIT@_la_LIBADD = @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ \ 515lib@LIBNAVIT@_la_LIBADD = @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ \
524 @INTLLIBS@ -Lfib-1.1 -lfib @MODULE_LIBADD@ @CRYPTO_LIBS@ \ 516 @INTLLIBS@ -Lfib-1.1 -lfib @MODULE_LIBADD@ @CRYPTO_LIBS@ \
… …
1259@SUPPORT_ANDROID_TRUE@ mkdir -p $(builddir)/android/src/ 1251@SUPPORT_ANDROID_TRUE@ mkdir -p $(builddir)/android/src/
1260@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then chmod -R u+w $(builddir)/android/src/; fi 1252@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then chmod -R u+w $(builddir)/android/src/; fi
1261@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/src/; fi 1253@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/src/; fi
1262@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then cp -rpf $(srcdir)/android/* $(builddir)/android; fi 1254@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then cp -rpf $(srcdir)/android/* $(builddir)/android; fi
1263 1255
1264@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/lib/; fi 1256# @SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/lib/; fi
1265@SUPPORT_ANDROID_TRUE@ mkdir -p $(builddir)/android/lib/ 1257# @SUPPORT_ANDROID_TRUE@ mkdir -p $(builddir)/android/lib/
1266@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then cp -pf $(srcdir)/android/tagsoup-1.2.1.jar $(builddir)/android/lib/; fi 1258# @SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then cp -pf $(srcdir)/android/tagsoup-1.2.1.jar $(builddir)/android/lib/; fi
1267 1259
1268@SUPPORT_ANDROID_TRUE@ touch $(srcdir)/android/dummy.txt 1260@SUPPORT_ANDROID_TRUE@ touch $(srcdir)/android/dummy.txt
1269@SUPPORT_ANDROID_TRUE@ touch $(builddir)/android/dummy.txt 1261@SUPPORT_ANDROID_TRUE@ touch $(builddir)/android/dummy.txt
1270 1262
1271######## -------------------------- 1263######## --------------------------
… …
1392 1384
1393@SUPPORT_ANDROID_TRUE@apkg-all: all android/build.xml navit.xml 1385@SUPPORT_ANDROID_TRUE@apkg-all: all android/build.xml navit.xml
1394 1386
1395@SUPPORT_ANDROID_TRUE@ echo "making::apkg-all" 1387@SUPPORT_ANDROID_TRUE@ echo "making::apkg-all"
1396 1388
1397@SUPPORT_ANDROID_TRUE@ mkdir -p android/libs/$(b_arch) 1389@SUPPORT_ANDROID_TRUE@ mkdir -p android/nativelibs/$(b_arch)
1398# cp .libs/*.so android/libs/$(b_arch)/libnavit.so
1399# 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
1400 1390
1401# remove old libs 1391# remove old libs
1402# ls -al android/libs/$(b_arch)/lib*.so 1392# ls -al android/nativelibs/$(b_arch)/lib*.so
1403@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libgraphics_android.so 1393@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libgraphics_android.so
1404@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libgraphics_null.so 1394@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libgraphics_null.so
1405@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libgui_internal.so 1395@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libgui_internal.so
1406@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libmap_binfile.so 1396@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libmap_binfile.so
1407@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libmap_csv.so 1397@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libmap_csv.so
1408@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libmap_filter.so 1398@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libmap_filter.so
1409@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libmap_mg.so 1399@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libmap_mg.so
1410@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libmap_shapefile.so 1400@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libmap_shapefile.so
1411@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libmap_textfile.so 1401@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libmap_textfile.so
1412@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libosd_core.so 1402@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libosd_core.so
1413@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libspeech_android.so 1403@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libspeech_android.so
1414@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libvehicle_android.so 1404@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libvehicle_android.so
1415@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libvehicle_demo.so 1405@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libvehicle_demo.so
1416@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libvehicle_file.so 1406@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libvehicle_file.so
1417@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libvehicle_pipe.so 1407@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libvehicle_pipe.so
1418@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libvehicle_serial.so 1408@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libvehicle_serial.so
1419@SUPPORT_ANDROID_TRUE@ rm -f android/libs/$(b_arch)/libvehicle_socket.so 1409@SUPPORT_ANDROID_TRUE@ rm -f android/nativelibs/$(b_arch)/libvehicle_socket.so
1420 1410
1421@SUPPORT_ANDROID_TRUE@ mkdir -p android/res/raw 1411@SUPPORT_ANDROID_TRUE@ mkdir -p android/res/raw
1422@SUPPORT_ANDROID_TRUE@ for i in $(shell cd ../po && echo *.mo); do cp ../po/$$i android/res/raw/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done 1412@SUPPORT_ANDROID_TRUE@ for i in $(shell cd ../po && echo *.mo); do cp ../po/$$i android/res/raw/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
1423@SUPPORT_ANDROID_TRUE@ cp navit_android_mdpi.xml android/res/raw/navitmdpi.xml 1413@SUPPORT_ANDROID_TRUE@ cp navit_android_mdpi.xml android/res/raw/navitmdpi.xml
1424@SUPPORT_ANDROID_TRUE@ cp navit_android_ldpi.xml android/res/raw/navitldpi.xml 1414@SUPPORT_ANDROID_TRUE@ cp navit_android_ldpi.xml android/res/raw/navitldpi.xml
1425@SUPPORT_ANDROID_TRUE@ cp navit_android_hdpi.xml android/res/raw/navithdpi.xml 1415@SUPPORT_ANDROID_TRUE@ cp navit_android_hdpi.xml android/res/raw/navithdpi.xml
1426 1416
1427# cleanup svn dirs, they should never be in build dir 1417# cleanup svn dirs, they should never be in build dir
1428@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then find $(builddir) -type d -name '\.svn' -exec rm -Rf {} \; ; fi; echo "ignore the find errors!!" 1418@SUPPORT_ANDROID_TRUE@ if [ "$(builddir)" != "$(srcdir)" ]; then find $(builddir) -type d -name '\.svn' -exec rm -Rf {} \; ; fi; echo "ignore the find errors!!"
1429 1419
1430@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/libs/$(b_arch) ; fi 1420@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/nativelibs/$(b_arch) ; fi
1431@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then install -p $(NDK)/prebuilt/android-arm/gdbserver/gdbserver android/libs/$(b_arch)/gdbserver ; fi 1421@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then install -p $(NDK)/prebuilt/android-arm/gdbserver/gdbserver android/nativelibs/$(b_arch)/gdbserver ; fi
1432@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/libs/$(b_arch) ; fi 1422@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/nativelibs/$(b_arch) ; fi
1433@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/obj/local/$(b_arch) ; fi 1423@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then mkdir -p android/obj/local/$(b_arch) ; fi
1434@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then cp android/libs/$(b_arch)/*.so android/obj/local/$(b_arch)/ ; fi 1424@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then cp android/nativelibs/$(b_arch)/*.so android/obj/local/$(b_arch)/ ; fi
1435@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then echo "set solib-search-path $(builddir)/obj/local/$(b_arch)" > android/libs/$(b_arch)/gdb.setup ; fi 1425@SUPPORT_ANDROID_TRUE@ if [ "$(DO_RELEASE_BUILD)" != "1" ]; then echo "set solib-search-path $(builddir)/obj/local/$(b_arch)" > android/nativelibs/$(b_arch)/gdb.setup ; fi
1436@SUPPORT_ANDROID_TRUE@ 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 1426@SUPPORT_ANDROID_TRUE@ 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
1437 1427
1438# strip libs if release build is selected 1428# strip libs if release build is selected
1439# if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; arm-linux-androideabi-strip --strip-unneeded $(builddir)/android/libs/armeabi/* ; echo "done" ; fi 1429# if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; arm-linux-androideabi-strip --strip-unneeded $(builddir)/android/nativelibs/armeabi/* ; echo "done" ; fi
1440# if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; arm-linux-androideabi-strip --strip-unneeded $(builddir)/android/libs/armeabi-v7a/* ; echo "done" ; fi 1430# if [ "$(DO_RELEASE_BUILD)" == "1" ]; then echo "stripping libs ..."; arm-linux-androideabi-strip --strip-unneeded $(builddir)/android/nativelibs/armeabi-v7a/* ; echo "done" ; fi
1441# 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 1431# 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/nativelibs/x86/* ; echo "done" ; fi
1442 1432
1443@SUPPORT_ANDROID_TRUE@apkg: apkg-all 1433@SUPPORT_ANDROID_TRUE@apkg: apkg-all
1444@SUPPORT_ANDROID_TRUE@ echo "making::apkg" 1434@SUPPORT_ANDROID_TRUE@ echo "making::apkg"
1445@SUPPORT_ANDROID_TRUE@ touch $(srcdir)/android/dummy.txt 1435@SUPPORT_ANDROID_TRUE@ touch $(srcdir)/android/dummy.txt
1446@SUPPORT_ANDROID_TRUE@ touch $(builddir)/android/dummy.txt 1436@SUPPORT_ANDROID_TRUE@ touch $(builddir)/android/dummy.txt
Legend:
Removed from v.55  
changed lines
  Added in v.56
   
Visit the ZANavi Wiki