Fix:Core:Better win32 module loading

[navit-package] / navit / Makefile.am

diff --git a/navit/Makefile.am b/navit/Makefile.am
index 1797d27..4610d77 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -1,12 +1,19 @@
 include $(top_srcdir)/Makefile.inc
+comma=,
+SUBDIRS=fib-1.1 support
+if PLUGINS
+  SUBDIRS += .
+endif
 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
+if !PLUGINS
+  SUBDIRS += .
+endif
 
-SUBDIRS+=.
 SUBDIRS+=maptool
 
 if BUILD_SAMPLEMAP
@@ -17,13 +24,15 @@ endif
 AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit
 BUILT_SOURCES = version.h navit_config.h
 
-if SUPPORT_ANDROID
-  lib_LTLIBRARIES        = libnavit.la
-  libnavit_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@ -Wl,--no-undefined
-  libnavit_la_LIBADD = @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @INTLLIBS@ -Lfib-1.1 -lfib -llog
+if BIN_NAVIT
+  bin_PROGRAMS = navit
+endif
 
+if SHARED_LIBNAVIT
+  lib_LTLIBRARIES        = libnavit.la
+  libnavit_la_LDFLAGS = -avoid-version @MODULE_LDFLAGS@ -no-undefined -Wl,--no-undefined
+  libnavit_la_LIBADD = @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @INTLLIBS@ -Lfib-1.1 -lfib @MODULE_LIBADD@
 else
-  bin_PROGRAMS = navit
   noinst_LTLIBRARIES        = libnavit.la
 endif
 
@@ -41,14 +50,13 @@ libnavit_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c command.c
        map_data.h mapset.h maptype.h menu.h messages.h navigation.h navit.h osd.h \
        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 \
        transform.h track.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \
-       navit_nls.h
+       navit_nls.h sunriset.c sunriset.h
 
-comma=,
 XSLTS=@XSLTS@
 navit.xml: navit_shipped.xml  $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt))))
        cp $< navit.xml.new
        if [ ! -f "$(builddir)/navit.dtd" ]; then cp -f $(srcdir)/navit.dtd $(builddir)/navit.dtd; fi
-       for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then echo "Applying $$i" ; saxon -snone navit.xml.new $$i >navit.xml.tmp || exit ; mv navit.xml.tmp navit.xml.new || exit ; fi ; done
+       for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then echo "Applying $$i" ; @SAXON@ -snone navit.xml.new $$i >navit.xml.tmp || exit ; mv navit.xml.tmp navit.xml.new || exit ; fi ; done
        mv navit.xml.new navit.xml
        rm -f navit.xml.tmp
        
@@ -58,8 +66,16 @@ if SUPPORT_ANDROID
   navit_SOURCES =
   navit_LDADD =
 
+android/AndroidManifest.xml: android/AndroidManifest.xml.in
+       mkdir -p $(builddir)/android
+       sed '0,/<uses-sdk/!d' <$< >$@
+       for i in $(subst $(comma), ,@ANDROID_PERMISSIONS@); do echo "    <uses-permission android:name=\"android.permission.$$i\" />" >>$@; done
+       sed '0,/<uses-sdk/d' <$< >>$@
+       
+
 android/build.xml: android/AndroidManifest.xml
-       if [ "$(builddir)" != "$(srcdir)" ]; then cp -rp $(srcdir)/android $(builddir)/android; fi
+       mkdir -p android
+       if [ "$(builddir)" != "$(srcdir)" ]; then cp -rp $(srcdir)/android/* $(builddir)/android; fi
        android update project -t 3 -p android
 
 apk: all android/build.xml navit.xml