diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-05-18 10:37:40 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-05-18 10:37:40 +0000 |
| commit | 5eaa7af4002f9a07d86cd8182ead9fc3de591f45 (patch) | |
| tree | 5bdc8f0c507f94f774c95749b485d2d508a48e1a /navit/speech | |
| parent | 9905b40429a4f1c56ef7b629703daa85587896af (diff) | |
| download | navit-svn-5eaa7af4002f9a07d86cd8182ead9fc3de591f45.tar.gz | |
Fix:Build:Correctly build modules when plugins are disabled
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3266 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/speech')
| -rw-r--r-- | navit/speech/cmdline/Makefile.am | 4 | ||||
| -rw-r--r-- | navit/speech/espeak/Makefile.am | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/navit/speech/cmdline/Makefile.am b/navit/speech/cmdline/Makefile.am index ac1d7aa9..4597bd93 100644 --- a/navit/speech/cmdline/Makefile.am +++ b/navit/speech/cmdline/Makefile.am @@ -1,5 +1,9 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_cmdline +if PLUGINS modulespeech_LTLIBRARIES = libspeech_cmdline.la +else +noinst_LTLIBRARIES = libspeech_cmdline.la +endif libspeech_cmdline_la_SOURCES = speech_cmdline.c 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 1bdeb387..b48150a5 100644 --- a/navit/speech/espeak/Makefile.am +++ b/navit/speech/espeak/Makefile.am @@ -1,5 +1,9 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_espeak +if PLUGINS modulespeech_LTLIBRARIES = libspeech_espeak.la +else +noinst_LTLIBRARIES = libspeech_espeak.la +endif libspeech_espeak_la_SOURCES = speak.c libspeech_espeak_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@ -L$(top_builddir)/navit/support/espeak -lsupport_espeak -Wl,-lwinmm |