Add:Core:More android work

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2458 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/configure.in b/configure.in
index da239d1..ca27d8d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -55,6 +55,54 @@ vehicle_file=yes; vehicle_file_reason=default
 vehicle_gpsd=yes; vehicle_gpsd_reason=default
 vehicle_gypsy=yes; vehicle_gypsy_reason=default
 vehicle_wince=no; vehicle_wince_reason=default
+vehicle_android=no; vehicle_android_reason=default
+graphics_android=no; graphics_android_reason=default
+
+AC_CANONICAL_HOST
+win32=no
+win32ce=no
+case $host_os in
+wince)
+       win32=yes
+       win32ce=yes
+       AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
+       AC_DEFINE(HAVE_API_WIN32_CE, 1, [Have Windows CE API])
+       gui_win32=yes; gui_win32_reason="host_os is wince"
+       graphics_win32=yes; graphics_win32_reason="host_os is wince"
+       vehicle_wince=yes; vehcile_wince_reason="host_os is wince"
+       ;;
+mingw32)
+       win32=yes
+       AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
+       AC_DEFINE(HAVE_API_WIN32, 1, [Have Windows API])
+       gui_win32=yes; gui_win32_reason="host_os is mingw32"
+       graphics_win32=yes; graphics_win32_reason="host_os is mingw32"
+       ;;
+linux*_android)
+       android=yes
+       AC_DEFINE(HAVE_API_ANDROID, 1, [Have Android API])
+       echo "void dl_unwind_find_exidx(void) {}" >crt0.c
+       $CC -c crt0.c
+       $AR r libg.a crt0.a
+       vehicle_android=yes; vehicle_android_reason="host_os is android"
+       graphics_android=yes; graphics_android_reason="host_os is android"
+       MODULE_LDFLAGS="-Xcompiler -nostdlib"
+       ;;
+esac
+if test "x$win32" = "xyes"
+then
+       NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/win32"
+       NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/win32 -lsupport_win32"
+fi
+AM_CONDITIONAL(SUPPORT_WIN32, [test "x$win32" = "xyes"])
+AM_CONDITIONAL(SUPPORT_WIN32CE, [test "x$win32ce" = "xyes"])
+AM_CONDITIONAL(SUPPORT_ANDROID, [test "x$android" =" xyes"])
+AC_SUBST(MODULE_LDFLAGS)
+
+LIBS="$LIBS -lm"
+if test "$win32" == "no"; then
+       LIBS="$LIBS -rdynamic"
+fi
 
 m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],
        [AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE])])
@@ -582,39 +630,6 @@ AC_SUBST(VERSION)
 AC_CHECK_HEADER(wordexp.h,wordexp_h=yes,wordexp_h=no;NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/wordexp";NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/wordexp -lsupport_wordexp")
 AM_CONDITIONAL(SUPPORT_WORDEXP, [test "x$wordexp_h" = "xno"])
 
-AC_CANONICAL_HOST
-win32=no
-win32ce=no
-case $host_os in
-wince)
-       win32=yes
-       win32ce=yes
-       AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
-       AC_DEFINE(HAVE_API_WIN32_CE, 1, [Have Windows CE API])
-       gui_win32=yes; gui_win32_reason="host_os is wince"
-       graphics_win32=yes; graphics_win32_reason="host_os is wince"
-       vehicle_wince=yes; vehcile_wince_reason="host_os is wince"
-       ;;
-mingw32)
-       win32=yes
-       AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
-       AC_DEFINE(HAVE_API_WIN32, 1, [Have Windows API])
-       gui_win32=yes; gui_win32_reason="host_os is mingw32"
-       graphics_win32=yes; graphics_win32_reason="host_os is mingw32"
-esac
-if test "x$win32" = "xyes"
-then
-       NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/win32"
-       NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/win32 -lsupport_win32"
-fi
-AM_CONDITIONAL(SUPPORT_WIN32, [test "x$win32" = "xyes"])
-AM_CONDITIONAL(SUPPORT_WIN32CE, [test "x$win32ce" = "xyes"])
-
-LIBS="$LIBS -lm"
-if test "$win32" == "no"; then
-       LIBS="$LIBS -rdynamic"
-fi
-
 support_libc=no
 AC_ARG_ENABLE(support_libc, [  --enable-support-libc enable builtin mini libc ], support_libc=$enableval)
 AM_CONDITIONAL(SUPPORT_LIBC, [test "x$support_libc" = "xyes"])
@@ -623,6 +638,9 @@ if test "x$support_libc" = "xyes"; then
 fi
 
 ## graphics
+# android
+AC_ARG_ENABLE(graphics-android, [  --disable-graphics-android            disable graphics type android], graphics_android=$enableval;graphics_android_reason="configure parameter")
+AM_CONDITIONAL(GRAPHICS_ANDROID, test "x${graphics_android}" = "xyes")
 # gd
 AC_ARG_ENABLE(graphics-gd, [  --enable-graphics-gd                enable graphics type gd], graphics_gd=$enableval;graphics_gd_reason="configure parameter")
 if test "x${graphics_gd}" = "xyes" ; then
@@ -698,6 +716,9 @@ AC_SUBST(SPEECHD_LIBS)
 AM_CONDITIONAL(SPEECH_SPEECH_DISPATCHER, test "x${speech_speech_dispatcher}" = "xyes")
 
 ## vehicle
+# android
+AC_ARG_ENABLE(vehicle-android, [  --disable-vehicle-android             disable vehicle type android], vehicle_android=$enableval;vehicle_android_reason="configure parameter")
+AM_CONDITIONAL(VEHICLE_ANDROID, test "x${vehicle_android}" = "xyes")
 # demo
 AC_ARG_ENABLE(vehicle-demo, [  --disable-vehicle-demo              disable vehicle type demo], vehicle_demo=$enableval;vehicle_demo_reason="configure parameter")
 AM_CONDITIONAL(VEHICLE_DEMO, test "x${vehicle_demo}" = "xyes")
@@ -777,6 +798,7 @@ navit/support/win32/Makefile
 navit/support/wordexp/Makefile
 navit/support/zlib/Makefile
 navit/vehicle/Makefile
+navit/vehicle/android/Makefile
 navit/vehicle/file/Makefile
 navit/vehicle/gpsd/Makefile
 navit/vehicle/gypsy/Makefile
@@ -848,6 +870,7 @@ echo "NLS Support:         $enable_nls ($nls_libs)"
 echo "Font renderers:"
 echo "  freetype:          $font_freetype ($font_freetype_reason)"
 echo "Graphics types:"
+echo "  android:  $graphics_android ($graphics_android_reason)"
 echo "  gtk_drawing_area:  $graphics_gtk_drawing_area ($graphics_gtk_drawing_area_reason)"
 echo "  qt_qpainter:       $graphics_qt_qpainter ($graphics_qt_qpainter_reason)"
 echo "  win32:             $graphics_win32 ($graphics_win32_reason)"
@@ -869,6 +892,7 @@ echo "  cmdline:           $speech_cmdline ($speech_cmdline_reason)"
 echo "  speech_dispatcher: $speech_speech_dispatcher ($speech_speech_dispatcher_reason)"
 
 echo "Vehicle types:"
+echo "  android:           $vehicle_android ($vehicle_android_reason)"
 echo "  demo:              $vehicle_demo ($vehicle_demo_reason)"
 echo "  file:              $vehicle_file ($vehicle_file_reason)"
 echo "  gpsd:              $vehicle_gpsd ($vehicle_gpsd_reason)"

diff --git a/navit/graphics/Makefile.am b/navit/graphics/Makefile.am
index af999d0..4b18d22 100644 (file)
--- a/navit/graphics/Makefile.am
+++ b/navit/graphics/Makefile.am
@@ -1,4 +1,7 @@
 SUBDIRS=null
+if GRAPHICS_ANDROID
+  SUBDIRS+=android
+endif
 if GRAPHICS_GTK_DRAWING_AREA
   SUBDIRS+=gtk_drawing_area
 endif

diff --git a/navit/graphics/android/Makefile.am b/navit/graphics/android/Makefile.am
index 9f1d093..7106b38 100644 (file)
--- a/navit/graphics/android/Makefile.am
+++ b/navit/graphics/android/Makefile.am
@@ -6,11 +6,4 @@ else
 noinst_LTLIBRARIES = libgraphics_android.la
 endif
 libgraphics_android_la_SOURCES = graphics_android.c
-libgraphics_android_la_LDFLAGS = -module -avoid-version  -Xcompiler -nostdlib
-
-android: libgraphics_android.la
-       mkdir -p ../../android/libs/armeabi/navit/graphics
-       cp .libs/libgraphics_android.so ../../android/libs/armeabi
-
-push: libgraphics_android.la
-       adb push .libs/libgraphics_android.so /data/data/org.navitproject.navit/lib
+libgraphics_android_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@

diff --git a/navit/graphics/null/Makefile.am b/navit/graphics/null/Makefile.am
index 9fe6ffc..15d1a08 100644 (file)
--- a/navit/graphics/null/Makefile.am
+++ b/navit/graphics/null/Makefile.am
@@ -6,4 +6,4 @@ else
 noinst_LTLIBRARIES = libgraphics_null.la
 endif
 libgraphics_null_la_SOURCES = graphics_null.c
-libgraphics_null_la_LDFLAGS = -module -avoid-version
+libgraphics_null_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@

diff --git a/navit/gui/internal/Makefile.am b/navit/gui/internal/Makefile.am
index abb308f..046a56c 100644 (file)
--- a/navit/gui/internal/Makefile.am
+++ b/navit/gui/internal/Makefile.am
@@ -3,4 +3,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ -DMODULE=gui_internal
 modulegui_LTLIBRARIES = libgui_internal.la
 libgui_internal_la_SOURCES = gui_internal.c gui_internal.h
 libgui_internal_la_LIBADD = 
-libgui_internal_la_LDFLAGS = -module -avoid-version
+libgui_internal_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@

diff --git a/navit/map/binfile/Makefile.am b/navit/map/binfile/Makefile.am
index e35e18b..6041bf8 100644 (file)
--- a/navit/map/binfile/Makefile.am
+++ b/navit/map/binfile/Makefile.am
@@ -6,4 +6,4 @@ else
   noinst_LTLIBRARIES = libmap_binfile.la
 endif
 libmap_binfile_la_SOURCES = binfile.c
-libmap_binfile_la_LDFLAGS = -module -avoid-version
+libmap_binfile_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@

diff --git a/navit/map/mg/Makefile.am b/navit/map/mg/Makefile.am
index 7fcef2d..7f692c6 100644 (file)
--- a/navit/map/mg/Makefile.am
+++ b/navit/map/mg/Makefile.am
@@ -6,4 +6,4 @@ else
   noinst_LTLIBRARIES = libmap_mg.la
 endif
 libmap_mg_la_SOURCES = map.c block.c town.c tree.c poly.c street.c mg.h
-libmap_mg_la_LDFLAGS = -module -avoid-version
+libmap_mg_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@

diff --git a/navit/map/shapefile/Makefile.am b/navit/map/shapefile/Makefile.am
index 3483f44..cb657d0 100644 (file)
--- a/navit/map/shapefile/Makefile.am
+++ b/navit/map/shapefile/Makefile.am
@@ -6,4 +6,4 @@ else
   noinst_LTLIBRARIES = libmap_shapefile.la
 endif
 libmap_shapefile_la_SOURCES = shapefile.c dbfopen.c shpopen.c shptree.c shapefil.h
-libmap_shapefile_la_LDFLAGS = -module -avoid-version
+libmap_shapefile_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@

diff --git a/navit/map/textfile/Makefile.am b/navit/map/textfile/Makefile.am
index a136796..39308a6 100644 (file)
--- a/navit/map/textfile/Makefile.am
+++ b/navit/map/textfile/Makefile.am
@@ -6,4 +6,4 @@ else
   noinst_LTLIBRARIES = libmap_textfile.la
 endif
 libmap_textfile_la_SOURCES = textfile.c textfile.h
-libmap_textfile_la_LDFLAGS = -module -avoid-version
+libmap_textfile_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@

diff --git a/navit/osd/core/Makefile.am b/navit/osd/core/Makefile.am
index 5594082..72131f1 100644 (file)
--- a/navit/osd/core/Makefile.am
+++ b/navit/osd/core/Makefile.am
@@ -6,5 +6,5 @@ else
   noinst_LTLIBRARIES = libosd_core.la
 endif
 libosd_core_la_SOURCES = osd_core.c
-libosd_core_la_LDFLAGS = -module -avoid-version
+libosd_core_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
 

diff --git a/navit/speech/cmdline/Makefile.am b/navit/speech/cmdline/Makefile.am
index 025d553..35a199c 100644 (file)
--- a/navit/speech/cmdline/Makefile.am
+++ b/navit/speech/cmdline/Makefile.am
@@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_cmdline
 modulespeech_LTLIBRARIES = libspeech_cmdline.la
 libspeech_cmdline_la_SOURCES = speech_cmdline.c
-libspeech_cmdline_la_LDFLAGS = -module -avoid-version
+libspeech_cmdline_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@

diff --git a/navit/vehicle/Makefile.am b/navit/vehicle/Makefile.am
index 08a9da9..9737caf 100644 (file)
--- a/navit/vehicle/Makefile.am
+++ b/navit/vehicle/Makefile.am
@@ -1,4 +1,7 @@
 SUBDIRS=
+if VEHICLE_ANDROID
+  SUBDIRS += android
+endif
 if VEHICLE_DEMO
   SUBDIRS += demo
 endif

diff --git a/navit/vehicle/android/Makefile.am b/navit/vehicle/android/Makefile.am
new file mode 100644 (file)
index 0000000..f1733bd
--- /dev/null
+++ b/navit/vehicle/android/Makefile.am
@@ -0,0 +1,5 @@
+include $(top_srcdir)/Makefile.inc
+AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_android
+modulevehicle_LTLIBRARIES = libvehicle_android.la
+libvehicle_android_la_SOURCES = vehicle_android.c
+libvehicle_android_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@