Fix:Core:Better win32 module loading

[navit-package] / navit / Makefile.am

diff --git a/navit/Makefile.am b/navit/Makefile.am
index 6bca21d..4610d77 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -1,13 +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
@@ -18,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
 
@@ -44,7 +52,6 @@ libnavit_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c command.c
        transform.h track.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.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
@@ -67,7 +74,8 @@ android/AndroidManifest.xml: android/AndroidManifest.xml.in
        
 
 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