Fix:Build:Correctly build modules when plugins are disabled

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3265 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/gui/internal/Makefile.am b/navit/navit/gui/internal/Makefile.am
index c37d7f3..3ad2c93 100644 (file)
--- a/navit/navit/gui/internal/Makefile.am
+++ b/navit/navit/gui/internal/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ -DMODULE=gui_internal
-modulegui_LTLIBRARIES = libgui_internal.la
+noinst_LTLIBRARIES = libgui_internal.la
 libgui_internal_la_SOURCES = gui_internal.c gui_internal.h
 libgui_internal_la_LIBADD = 
-libgui_internal_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
+libgui_internal_la_LDFLAGS = @NAVIT_MODULE_LDFLAGS@

diff --git a/navit/navit/vehicle/demo/Makefile.am b/navit/navit/vehicle/demo/Makefile.am
index 3e5b3cb..5662119 100644 (file)
--- a/navit/navit/vehicle/demo/Makefile.am
+++ b/navit/navit/vehicle/demo/Makefile.am
@@ -1,5 +1,9 @@
 include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_demo
+if PLUGINS
 modulevehicle_LTLIBRARIES = libvehicle_demo.la
+else
+noinst_LTLIBRARIES = libvehicle_demo.la
+endif
 libvehicle_demo_la_SOURCES = vehicle_demo.c
 libvehicle_demo_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@

diff --git a/navit/navit/vehicle/wince/Makefile.am b/navit/navit/vehicle/wince/Makefile.am
index df96e0b..af6fcb1 100644 (file)
--- a/navit/navit/vehicle/wince/Makefile.am
+++ b/navit/navit/vehicle/wince/Makefile.am
@@ -1,5 +1,9 @@
 include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_wince
+if PLUGINS
 modulevehicle_LTLIBRARIES = libvehicle_wince.la
+else
+noinst_LTLIBRARIES = libvehicle_wince.la
+endif
 libvehicle_wince_la_SOURCES = vehicle_wince.c
 libvehicle_wince_la_LDFLAGS = -module -avoid-version