projects
/
navit-package
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add:Core:Experimental support for win32 plugins|Thanks to gotwo for the work
[navit-package]
/
navit
/
Makefile.am
diff --git
a/navit/Makefile.am
b/navit/Makefile.am
index
6907600
..
4610d77
100644
(file)
--- a/
navit/Makefile.am
+++ b/
navit/Makefile.am
@@
-24,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
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
else
- bin_PROGRAMS = navit
noinst_LTLIBRARIES = libnavit.la
endif
noinst_LTLIBRARIES = libnavit.la
endif