Fix:Build:Changed linking of modules for android due to recent change in loading behaviour

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2849 ffa7fe5e-494d-0410-b361-a75ebd5db220

19 files changed, 23 insertions, 20 deletions

diff --git a/configure.in b/configure.in
index c3ea64337..c3f3a0f3c 100644
--- a/configure.in
+++ b/configure.in
@@ -99,6 +99,7 @@ linux*_android)
 	graphics_android=yes; graphics_android_reason="host_os is android"
 	speech_android=yes; speech_android_reason="host_os is android"
 	MODULE_LDFLAGS="-Xcompiler -nostdlib"
+	NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS -L\$(top_builddir)/navit -lnavit"
 	;;
 esac
 if test "x$win32" = "xyes"
@@ -120,6 +121,7 @@ fi
 AM_CONDITIONAL(SUPPORT_LIBPNG, [test "x$support_libpng" = "xyes"])
 
 AC_SUBST(MODULE_LDFLAGS)
+AC_SUBST(NAVIT_MODULE_LDFLAGS)
 
 LIBS="$LIBS -lm"
 if test "$win32" == "no"; then
diff --git a/navit/Makefile.am b/navit/Makefile.am
index 40559f270..710a58e38 100644
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -1,13 +1,14 @@
 include $(top_srcdir)/Makefile.inc
 comma=,
+SUBDIRS=fib-1.1 support
+SUBDIRS+=.
 DIST_SUBDIRS=binding map maptool fib-1.1 font fonts gui graphics osd speech support vehicle xpm maps
-SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm
+SUBDIRS+=binding map font gui graphics osd speech vehicle xpm
 
 if FONTS
   SUBDIRS += fonts
 endif
 
-SUBDIRS+=.
 SUBDIRS+=maptool
 
 if BUILD_SAMPLEMAP
diff --git a/navit/graphics/android/Makefile.am b/navit/graphics/android/Makefile.am
index 7106b389c..a625edd1c 100644
--- a/navit/graphics/android/Makefile.am
+++ b/navit/graphics/android/Makefile.am
@@ -6,4 +6,4 @@ else
 noinst_LTLIBRARIES = libgraphics_android.la
 endif
 libgraphics_android_la_SOURCES = graphics_android.c
-libgraphics_android_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+libgraphics_android_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/graphics/null/Makefile.am b/navit/graphics/null/Makefile.am
index 15d1a0840..a4631ff4a 100644
--- 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 @MODULE_LDFLAGS@
+libgraphics_null_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/gui/internal/Makefile.am b/navit/gui/internal/Makefile.am
index 046a56c24..c37d7f304 100644
--- 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 @MODULE_LDFLAGS@
+libgui_internal_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/map/binfile/Makefile.am b/navit/map/binfile/Makefile.am
index 6041bf841..6bf671175 100644
--- 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 @MODULE_LDFLAGS@
+libmap_binfile_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/map/filter/Makefile.am b/navit/map/filter/Makefile.am
index 268c68c7e..3bd14e8bf 100644
--- a/navit/map/filter/Makefile.am
+++ b/navit/map/filter/Makefile.am
@@ -6,4 +6,4 @@ else
   noinst_LTLIBRARIES = libmap_filter.la
 endif
 libmap_filter_la_SOURCES = filter.c
-libmap_filter_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+libmap_filter_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/map/garmin/Makefile.am b/navit/map/garmin/Makefile.am
index 8e20c1e3a..13724594c 100644
--- a/navit/map/garmin/Makefile.am
+++ b/navit/map/garmin/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS+=-I$(srcdir)
 modulemap_LTLIBRARIES = libmap_garmin.la
 libmap_garmin_la_SOURCES = garmin.c garmin.h gar2navit.c gar2navit.h
 libmap_garmin_la_LIBADD = @LIBGARMIN_LIBS@
-libmap_garmin_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+libmap_garmin_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
 nodist_libmap_garmin_la_SOURCES = g2nbuiltin.h
 builddir = @builddir@
 
diff --git a/navit/map/mg/Makefile.am b/navit/map/mg/Makefile.am
index 7f692c6b5..ee05be835 100644
--- 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 @MODULE_LDFLAGS@
+libmap_mg_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/map/shapefile/Makefile.am b/navit/map/shapefile/Makefile.am
index cb657d0e8..5980bd355 100644
--- 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 @MODULE_LDFLAGS@
+libmap_shapefile_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/map/textfile/Makefile.am b/navit/map/textfile/Makefile.am
index 39308a6fe..b3190e7f7 100644
--- 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 @MODULE_LDFLAGS@
+libmap_textfile_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/osd/core/Makefile.am b/navit/osd/core/Makefile.am
index 72131f17b..10f17f8d2 100644
--- 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 @MODULE_LDFLAGS@
+libosd_core_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
 
diff --git a/navit/speech/cmdline/Makefile.am b/navit/speech/cmdline/Makefile.am
index 35a199c9f..ac1d7aa98 100644
--- 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 @MODULE_LDFLAGS@
+libspeech_cmdline_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/speech/espeak/Makefile.am b/navit/speech/espeak/Makefile.am
index aef0ec81e..fa635ae45 100644
--- a/navit/speech/espeak/Makefile.am
+++ b/navit/speech/espeak/Makefile.am
@@ -2,5 +2,5 @@ include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_espeak
 modulespeech_LTLIBRARIES = libspeech_espeak.la
 libspeech_espeak_la_SOURCES = speak.c 
-libspeech_espeak_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+libspeech_espeak_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
 
diff --git a/navit/support/espeak/Makefile.am b/navit/support/espeak/Makefile.am
index 8115d9004..3de91b41f 100755
--- a/navit/support/espeak/Makefile.am
+++ b/navit/support/espeak/Makefile.am
@@ -5,7 +5,7 @@ libsupport_espeak_la_SOURCES = compiledict.c dictionary.c intonation.c \
 	readclause.c setlengths.c numbers.c synth_mbrola.c \
 	synthdata.c synthesize.c translate.c \
 	tr_languages.c voices.c wavegen.c phonemelist.c klatt.c speak_init.c
-libsupport_espeak_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+libsupport_espeak_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
 
 #bin_PROGRAMS = speak
 
diff --git a/navit/vehicle/android/Makefile.am b/navit/vehicle/android/Makefile.am
index f1733bdb3..7f7799acb 100644
--- a/navit/vehicle/android/Makefile.am
+++ b/navit/vehicle/android/Makefile.am
@@ -2,4 +2,4 @@ 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@
+libvehicle_android_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/vehicle/demo/Makefile.am b/navit/vehicle/demo/Makefile.am
index 61a265c53..3e5b3cb24 100644
--- a/navit/vehicle/demo/Makefile.am
+++ b/navit/vehicle/demo/Makefile.am
@@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_demo
 modulevehicle_LTLIBRARIES = libvehicle_demo.la
 libvehicle_demo_la_SOURCES = vehicle_demo.c
-libvehicle_demo_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+libvehicle_demo_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/vehicle/file/Makefile.am b/navit/vehicle/file/Makefile.am
index 64a9c462f..a067a9796 100644
--- a/navit/vehicle/file/Makefile.am
+++ b/navit/vehicle/file/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit
 modulevehicle_LTLIBRARIES = libvehicle_file.la libvehicle_pipe.la
 libvehicle_file_la_CFLAGS=-DMODULE=vehicle_file
 libvehicle_file_la_SOURCES = vehicle_file.c
-libvehicle_file_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+libvehicle_file_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
 libvehicle_pipe_la_CFLAGS=-DMODULE=vehicle_pipe
 libvehicle_pipe_la_SOURCES = vehicle_pipe.c
-libvehicle_pipe_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+libvehicle_pipe_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/vehicle/null/Makefile.am b/navit/vehicle/null/Makefile.am
index 5141637e2..38c4a762e 100644
--- a/navit/vehicle/null/Makefile.am
+++ b/navit/vehicle/null/Makefile.am
@@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_null
 modulevehicle_LTLIBRARIES = libvehicle_null.la
 libvehicle_null_la_SOURCES = vehicle_null.c
-libvehicle_null_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+libvehicle_null_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@