diff options
28 files changed, 27 insertions, 36 deletions
diff --git a/navit/binding/dbus/Makefile.am b/navit/binding/dbus/Makefile.am index f156f8aef..06e95ab92 100644 --- a/navit/binding/dbus/Makefile.am +++ b/navit/binding/dbus/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=bindin modulebinding_LTLIBRARIES = libbinding_dbus.la libbinding_dbus_la_SOURCES = binding_dbus.c libbinding_dbus_la_LIBADD = @DBUS_LIBS@ -libbinding_dbus_la_LDFLAGS = -module +libbinding_dbus_la_LDFLAGS = -module -avoid-version diff --git a/navit/binding/python/Makefile.am b/navit/binding/python/Makefile.am index de79067f4..dd74229ae 100644 --- a/navit/binding/python/Makefile.am +++ b/navit/binding/python/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ @PYTHON_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=bind modulebinding_LTLIBRARIES = libbinding_python.la libbinding_python_la_SOURCES = binding_python.c main.c navit.c pcoord.c route.c navigation.c attr.c common.h libbinding_python_la_LIBADD = @PYTHON_LIBS@ -libbinding_python_la_LDFLAGS = -module +libbinding_python_la_LDFLAGS = -module -avoid-version diff --git a/navit/font/freetype/Makefile.am b/navit/font/freetype/Makefile.am index 8a82a6804..e5557fe99 100644 --- a/navit/font/freetype/Makefile.am +++ b/navit/font/freetype/Makefile.am @@ -6,4 +6,4 @@ else noinst_LTLIBRARIES = libfont_freetype.la endif libfont_freetype_la_SOURCES = font_freetype.c font_freetype.h -libfont_freetype_la_LDFLAGS = @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ -module +libfont_freetype_la_LDFLAGS = @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ -module -avoid-version diff --git a/navit/graphics/gd/Makefile.am b/navit/graphics/gd/Makefile.am index c6bfcfa5e..67fc270ac 100644 --- a/navit/graphics/gd/Makefile.am +++ b/navit/graphics/gd/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ @GD_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/navit -DMODULE=graphics_gd -libgraphics_gd_la_LDFLAGS = @GD_LIBS@ -module +libgraphics_gd_la_LDFLAGS = @GD_LIBS@ -module -avoid-version if PLUGINS modulegraphics_LTLIBRARIES = libgraphics_gd.la else diff --git a/navit/graphics/gtk_drawing_area/Makefile.am b/navit/graphics/gtk_drawing_area/Makefile.am index 36fa2d70a..79da228d7 100644 --- a/navit/graphics/gtk_drawing_area/Makefile.am +++ b/navit/graphics/gtk_drawing_area/Makefile.am @@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @GTK2_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/navit -DMODULE=graphics_gtk_drawing_area modulegraphics_LTLIBRARIES = libgraphics_gtk_drawing_area.la libgraphics_gtk_drawing_area_la_SOURCES = graphics_gtk_drawing_area.c -libgraphics_gtk_drawing_area_la_LDFLAGS = @GTK2_LIBS@ @IMLIB2_LIBS@ -module +libgraphics_gtk_drawing_area_la_LDFLAGS = @GTK2_LIBS@ @IMLIB2_LIBS@ -module -avoid-version diff --git a/navit/graphics/null/Makefile.am b/navit/graphics/null/Makefile.am index 6b7d4ea9f..9fe6ffc1e 100644 --- a/navit/graphics/null/Makefile.am +++ b/navit/graphics/null/Makefile.am @@ -6,4 +6,4 @@ else noinst_LTLIBRARIES = libgraphics_null.la endif libgraphics_null_la_SOURCES = graphics_null.c -libgraphics_null_la_LDFLAGS = -module +libgraphics_null_la_LDFLAGS = -module -avoid-version diff --git a/navit/graphics/opengl/Makefile.am b/navit/graphics/opengl/Makefile.am index 28bca80a0..02d356dd7 100644 --- a/navit/graphics/opengl/Makefile.am +++ b/navit/graphics/opengl/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ @OPENGL_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/navit modulegraphics_LTLIBRARIES = libgraphics_opengl.la libgraphics_opengl_la_SOURCES = graphics_opengl.c libgraphics_opengl_la_LIBADD = @OPENGL_LIBS@ @GLC_LIBS@ -libgraphics_opengl_la_LDFLAGS = -module +libgraphics_opengl_la_LDFLAGS = -module -avoid-version diff --git a/navit/graphics/qt_qpainter/Makefile.am b/navit/graphics/qt_qpainter/Makefile.am index 9e06927d4..b70d457dd 100644 --- a/navit/graphics/qt_qpainter/Makefile.am +++ b/navit/graphics/qt_qpainter/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @QT_GUI_CFLAGS@ @NAVIT_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/navit -DMODULE=graphics_qt_qpainter modulegraphics_LTLIBRARIES = libgraphics_qt_qpainter.la libgraphics_qt_qpainter_la_SOURCES = graphics_qt_qpainter.cpp graphics_qt_qpainter.moc -libgraphics_qt_qpainter_la_LDFLAGS = @QT_GUI_LIBS@ -module +libgraphics_qt_qpainter_la_LDFLAGS = @QT_GUI_LIBS@ -module -avoid-version BUILT_SOURCES = graphics_qt_qpainter.moc graphics_qt_qpainter.moc: moc $(srcdir)/graphics_qt_qpainter.cpp >graphics_qt_qpainter.moc diff --git a/navit/graphics/sdl/Makefile.am b/navit/graphics/sdl/Makefile.am index a3a776b8a..084bf3e97 100644 --- a/navit/graphics/sdl/Makefile.am +++ b/navit/graphics/sdl/Makefile.am @@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ @SDL_CFLAGS@ @FREETYPE2_CFLAGS@ @FONTCONFIG_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_sdl modulegraphics_LTLIBRARIES = libgraphics_sdl.la libgraphics_sdl_la_SOURCES = graphics_sdl.c raster.c raster.h -libgraphics_sdl_la_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ -module +libgraphics_sdl_la_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ -module -avoid-version diff --git a/navit/graphics/win32/Makefile.am b/navit/graphics/win32/Makefile.am index 9926b6017..a6fb52f90 100644 --- a/navit/graphics/win32/Makefile.am +++ b/navit/graphics/win32/Makefile.am @@ -6,4 +6,4 @@ else noinst_LTLIBRARIES = libgraphics_win32.la endif libgraphics_win32_la_SOURCES = graphics_win32.c xpm2bmp.c -libgraphics_win32_la_LDFLAGS = -module +libgraphics_win32_la_LDFLAGS = -module -avoid-version diff --git a/navit/gui/gtk/Makefile.am b/navit/gui/gtk/Makefile.am index f41561613..1588bfe8e 100644 --- a/navit/gui/gtk/Makefile.am +++ b/navit/gui/gtk/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @HILDON_CFLAGS@ @GTK2_CFLAGS@ modulegui_LTLIBRARIES = libgui_gtk.la libgui_gtk_la_SOURCES = datawindow.c destination.c gui_gtk_statusbar.c gui_gtk_action.c gui_gtk_window.c gui_gtk.h libgui_gtk_la_LIBADD = @GTK2_LIBS@ -libgui_gtk_la_LDFLAGS = -module +libgui_gtk_la_LDFLAGS = -module -avoid-version diff --git a/navit/gui/internal/Makefile.am b/navit/gui/internal/Makefile.am index 57a2692fe..abb308f5a 100644 --- a/navit/gui/internal/Makefile.am +++ b/navit/gui/internal/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ -DMODULE=gui_internal modulegui_LTLIBRARIES = libgui_internal.la libgui_internal_la_SOURCES = gui_internal.c gui_internal.h libgui_internal_la_LIBADD = -libgui_internal_la_LDFLAGS = -module +libgui_internal_la_LDFLAGS = -module -avoid-version diff --git a/navit/gui/win32/Makefile.am b/navit/gui/win32/Makefile.am index 1e2445057..06d91fac6 100644 --- a/navit/gui/win32/Makefile.am +++ b/navit/gui/win32/Makefile.am @@ -7,4 +7,4 @@ noinst_LTLIBRARIES = libgui_win32.la endif libgui_win32_la_SOURCES = gui_win32.c win32_gui_destination.c win32_gui_notify.c ceglue.h ceglue.c libgui_win32_la_LIBADD = -libgui_win32_la_LDFLAGS = -module +libgui_win32_la_LDFLAGS = -module -avoid-version diff --git a/navit/map/binfile/Makefile.am b/navit/map/binfile/Makefile.am index ebf820e04..e35e18bfa 100644 --- a/navit/map/binfile/Makefile.am +++ b/navit/map/binfile/Makefile.am @@ -6,4 +6,4 @@ else noinst_LTLIBRARIES = libmap_binfile.la endif libmap_binfile_la_SOURCES = binfile.c -libmap_binfile_la_LDFLAGS = -module +libmap_binfile_la_LDFLAGS = -module -avoid-version diff --git a/navit/map/garmin/Makefile.am b/navit/map/garmin/Makefile.am index 462923330..be15a148f 100644 --- a/navit/map/garmin/Makefile.am +++ b/navit/map/garmin/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS+=-I$(srcdir) modulemap_LTLIBRARIES = libmap_garmin.la libmap_garmin_la_SOURCES = garmin.c garmin.h gar2navit.c gar2navit.h libmap_garmin_la_LIBADD = @LIBGARMIN_LIBS@ -libmap_garmin_la_LDFLAGS = -module +libmap_garmin_la_LDFLAGS = -module -avoid-version nodist_libmap_garmin_la_SOURCES = g2nbuiltin.h builddir = @builddir@ diff --git a/navit/map/garmin_img/Makefile.am b/navit/map/garmin_img/Makefile.am index c365dfb8c..dbbcd9b55 100644 --- a/navit/map/garmin_img/Makefile.am +++ b/navit/map/garmin_img/Makefile.am @@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_garmin_img modulemap_LTLIBRARIES = libmap_garmin_img.la libmap_garmin_img_la_SOURCES = garmin_img.c -libmap_garmin_img_la_LDFLAGS = -module +libmap_garmin_img_la_LDFLAGS = -module -avoid-version diff --git a/navit/map/mg/Makefile.am b/navit/map/mg/Makefile.am index 38fbb1070..7fcef2de2 100644 --- a/navit/map/mg/Makefile.am +++ b/navit/map/mg/Makefile.am @@ -6,4 +6,4 @@ else noinst_LTLIBRARIES = libmap_mg.la endif libmap_mg_la_SOURCES = map.c block.c town.c tree.c poly.c street.c mg.h -libmap_mg_la_LDFLAGS = -module +libmap_mg_la_LDFLAGS = -module -avoid-version diff --git a/navit/map/poi_geodownload/Makefile.am b/navit/map/poi_geodownload/Makefile.am index 12d1e5e4f..e30f359e3 100644 --- a/navit/map/poi_geodownload/Makefile.am +++ b/navit/map/poi_geodownload/Makefile.am @@ -4,4 +4,4 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -I$(srcdir)/libmdb/include -D modulemap_LTLIBRARIES = libmap_poi_geodownload.la libmap_poi_geodownload_la_SOURCES = poi_geodownload.c libmap_poi_geodownload_la_LIBADD = -Llibmdb -lmdb -libmap_poi_geodownload_la_LDFLAGS = -module +libmap_poi_geodownload_la_LDFLAGS = -module -avoid-version diff --git a/navit/map/shapefile/Makefile.am b/navit/map/shapefile/Makefile.am index acf0ab10d..3483f440f 100644 --- a/navit/map/shapefile/Makefile.am +++ b/navit/map/shapefile/Makefile.am @@ -6,4 +6,4 @@ else noinst_LTLIBRARIES = libmap_shapefile.la endif libmap_shapefile_la_SOURCES = shapefile.c dbfopen.c shpopen.c shptree.c shapefil.h -libmap_shapefile_la_LDFLAGS = -module +libmap_shapefile_la_LDFLAGS = -module -avoid-version diff --git a/navit/map/textfile/Makefile.am b/navit/map/textfile/Makefile.am index b7afb3245..a136796f6 100644 --- a/navit/map/textfile/Makefile.am +++ b/navit/map/textfile/Makefile.am @@ -6,4 +6,4 @@ else noinst_LTLIBRARIES = libmap_textfile.la endif libmap_textfile_la_SOURCES = textfile.c textfile.h -libmap_textfile_la_LDFLAGS = -module +libmap_textfile_la_LDFLAGS = -module -avoid-version diff --git a/navit/osd/core/Makefile.am b/navit/osd/core/Makefile.am index b891aa49b..559408207 100644 --- a/navit/osd/core/Makefile.am +++ b/navit/osd/core/Makefile.am @@ -6,5 +6,5 @@ else noinst_LTLIBRARIES = libosd_core.la endif libosd_core_la_SOURCES = osd_core.c -libosd_core_la_LDFLAGS = -module +libosd_core_la_LDFLAGS = -module -avoid-version diff --git a/navit/speech/cmdline/Makefile.am b/navit/speech/cmdline/Makefile.am index b4c4c81e9..025d553ee 100644 --- a/navit/speech/cmdline/Makefile.am +++ b/navit/speech/cmdline/Makefile.am @@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_cmdline modulespeech_LTLIBRARIES = libspeech_cmdline.la libspeech_cmdline_la_SOURCES = speech_cmdline.c -libspeech_cmdline_la_LDFLAGS = -module +libspeech_cmdline_la_LDFLAGS = -module -avoid-version diff --git a/navit/speech/speech_dispatcher/Makefile.am b/navit/speech/speech_dispatcher/Makefile.am index d88af8e1e..a040740ef 100644 --- a/navit/speech/speech_dispatcher/Makefile.am +++ b/navit/speech/speech_dispatcher/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_speech_dispat modulespeech_LTLIBRARIES = libspeech_speech_dispatcher.la libspeech_speech_dispatcher_la_SOURCES = speech_speech_dispatcher.c libspeech_speech_dispatcher_la_LIBADD = @SPEECHD_LIBS@ -libspeech_speech_dispatcher_la_LDFLAGS = -module +libspeech_speech_dispatcher_la_LDFLAGS = -module -avoid-version diff --git a/navit/vehicle/demo/Makefile.am b/navit/vehicle/demo/Makefile.am index 062cf14b8..608e9d0b5 100644 --- a/navit/vehicle/demo/Makefile.am +++ b/navit/vehicle/demo/Makefile.am @@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_demo modulevehicle_LTLIBRARIES = libvehicle_demo.la libvehicle_demo_la_SOURCES = vehicle_demo.c -libvehicle_demo_la_LDFLAGS = -module +libvehicle_demo_la_LDFLAGS = -module -avoid-version diff --git a/navit/vehicle/file/Makefile.am b/navit/vehicle/file/Makefile.am index 1205c6442..e69de29bb 100644 --- a/navit/vehicle/file/Makefile.am +++ b/navit/vehicle/file/Makefile.am @@ -1,9 +0,0 @@ -include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -modulevehicle_LTLIBRARIES = libvehicle_file.la libvehicle_pipe.la -libvehicle_file_la_CFLAGS=-DMODULE=vehicle_file -libvehicle_file_la_SOURCES = vehicle_file.c -libvehicle_file_la_LDFLAGS = -module -libvehicle_pipe_la_CFLAGS=-DMODULE=vehicle_pipe -libvehicle_pipe_la_SOURCES = vehicle_pipe.c -libvehicle_pipe_la_LDFLAGS = -module diff --git a/navit/vehicle/gpsd/Makefile.am b/navit/vehicle/gpsd/Makefile.am index fde8b8675..1c47ccc56 100644 --- a/navit/vehicle/gpsd/Makefile.am +++ b/navit/vehicle/gpsd/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ @GPSBT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehic modulevehicle_LTLIBRARIES = libvehicle_gpsd.la libvehicle_gpsd_la_SOURCES = vehicle_gpsd.c libvehicle_gpsd_la_LIBADD = @GPSD_LIBS@ @GPSBT_LIBS@ -libvehicle_gpsd_la_LDFLAGS = -module +libvehicle_gpsd_la_LDFLAGS = -module -avoid-version diff --git a/navit/vehicle/gypsy/Makefile.am b/navit/vehicle/gypsy/Makefile.am index 37eb8fdc2..ed6aba4a9 100644 --- a/navit/vehicle/gypsy/Makefile.am +++ b/navit/vehicle/gypsy/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_gypsy modulevehicle_LTLIBRARIES = libvehicle_gypsy.la libvehicle_gypsy_la_SOURCES = vehicle_gypsy.c libvehicle_gypsy_la_LIBADD = @GYPSY_LIBS@ -libvehicle_gypsy_la_LDFLAGS = -module +libvehicle_gypsy_la_LDFLAGS = -module -avoid-version diff --git a/navit/vehicle/wince/Makefile.am b/navit/vehicle/wince/Makefile.am index b66e3206b..df96e0b62 100644 --- a/navit/vehicle/wince/Makefile.am +++ b/navit/vehicle/wince/Makefile.am @@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_wince modulevehicle_LTLIBRARIES = libvehicle_wince.la libvehicle_wince_la_SOURCES = vehicle_wince.c -libvehicle_wince_la_LDFLAGS = -module +libvehicle_wince_la_LDFLAGS = -module -avoid-version |