From: martin-s Date: Sat, 9 Jan 2010 20:19:09 +0000 (+0000) Subject: Fix:build:Make compileable X-Git-Url: http://git.maemo.org/git/?p=navit-package;a=commitdiff_plain;h=6c33e4314997dff2efeaaded52b0db83cb3c61c4 Fix:build:Make compileable git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2902 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- diff --git a/configure.in b/configure.in index 70c2ec6..c3850e2 100644 --- a/configure.in +++ b/configure.in @@ -91,7 +91,6 @@ mingw32) graphics_win32=yes; graphics_win32_reason="host_os is mingw32" speech_espeak=yes; speech_espeak_reason="host_os is mingw32" support_libpng=yes - MODULE_LIBADD="-Wl,-lwinmm" ;; linux*_android) android=yes diff --git a/navit/speech/espeak/Makefile.am b/navit/speech/espeak/Makefile.am index fa635ae..3fe361a 100644 --- a/navit/speech/espeak/Makefile.am +++ b/navit/speech/espeak/Makefile.am @@ -2,5 +2,4 @@ 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 @NAVIT_MODULE_LDFLAGS@ - +libspeech_espeak_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@ -L$(top_srcdir)/navit/support/espeak -lsupport_espeak -Wl,-lwinmm