diff options
author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-01-15 08:31:49 +0000 |
---|---|---|
committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-01-15 08:31:49 +0000 |
commit | 5901df91f01fd0226afeaf070b1368d9cb45d726 (patch) | |
tree | e50cc805a91c7cdfdacf35711f468c90fca2c37f | |
parent | 1d726e1b4d3dd64f552e82da3f5019ca373940d2 (diff) | |
download | navit-svn-5901df91f01fd0226afeaf070b1368d9cb45d726.tar.gz |
Fix:Build:Add -module to Makefiles
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1948 ffa7fe5e-494d-0410-b361-a75ebd5db220
32 files changed, 34 insertions, 6 deletions
diff --git a/navit/binding/dbus/Makefile.am b/navit/binding/dbus/Makefile.am index 72d8ef30..f156f8ae 100644 --- a/navit/binding/dbus/Makefile.am +++ b/navit/binding/dbus/Makefile.am @@ -3,3 +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 diff --git a/navit/binding/python/Makefile.am b/navit/binding/python/Makefile.am index 19006939..de79067f 100644 --- a/navit/binding/python/Makefile.am +++ b/navit/binding/python/Makefile.am @@ -3,3 +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 diff --git a/navit/font/freetype/Makefile.am b/navit/font/freetype/Makefile.am index cc533e94..8a82a680 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@ +libfont_freetype_la_LDFLAGS = @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ -module diff --git a/navit/graphics/cogl/Makefile.am b/navit/graphics/cogl/Makefile.am index 3f2f8aca..00a10900 100644 --- a/navit/graphics/cogl/Makefile.am +++ b/navit/graphics/cogl/Makefile.am @@ -3,3 +3,4 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ @CLUTTER_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/navit modulegraphics_LTLIBRARIES = libgraphics_cogl.la libgraphics_cogl_la_SOURCES = graphics_cogl.c navit_actor.c navit_actor.h libgraphics_cogl_la_LIBADD = @CLUTTER_LIBS@ @GLC_LIBS@ +libgraphics_cogl_la_LDFLAGS = -module diff --git a/navit/graphics/directfb/Makefile.am b/navit/graphics/directfb/Makefile.am index ec68b2ac..2f11fd7c 100644 --- a/navit/graphics/directfb/Makefile.am +++ b/navit/graphics/directfb/Makefile.am @@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ @DIRECTFB_CFLAGS@ @FREETYPE2_CFLAGS@ @FONTCONFIG_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_directfb modulegraphics_LTLIBRARIES = libgraphics_directfb.la libgraphics_directfb_la_SOURCES = graphics_directfb.c -libgraphics_directfb_la_LDFLAGS = @DIRECTFB_LIBS@ @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ @IMLIB2_LIBS@ +libgraphics_directfb_la_LDFLAGS = @DIRECTFB_LIBS@ @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ @IMLIB2_LIBS@ -module diff --git a/navit/graphics/gd/Makefile.am b/navit/graphics/gd/Makefile.am index 67cf1761..cb375b13 100644 --- a/navit/graphics/gd/Makefile.am +++ b/navit/graphics/gd/Makefile.am @@ -7,3 +7,4 @@ else noinst_LTLIBRARIES = libgraphics_gd.la endif libgraphics_gd_la_SOURCES = graphics_gd.c +libgraphics_gd_la_LDFLAGS = -module diff --git a/navit/graphics/gtk_drawing_area/Makefile.am b/navit/graphics/gtk_drawing_area/Makefile.am index 27c645ba..36fa2d70 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@ +libgraphics_gtk_drawing_area_la_LDFLAGS = @GTK2_LIBS@ @IMLIB2_LIBS@ -module diff --git a/navit/graphics/null/Makefile.am b/navit/graphics/null/Makefile.am index 436ca74c..6b7d4ea9 100644 --- a/navit/graphics/null/Makefile.am +++ b/navit/graphics/null/Makefile.am @@ -6,3 +6,4 @@ else noinst_LTLIBRARIES = libgraphics_null.la endif libgraphics_null_la_SOURCES = graphics_null.c +libgraphics_null_la_LDFLAGS = -module diff --git a/navit/graphics/opengl/Makefile.am b/navit/graphics/opengl/Makefile.am index b0a25f38..28bca80a 100644 --- a/navit/graphics/opengl/Makefile.am +++ b/navit/graphics/opengl/Makefile.am @@ -3,3 +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 diff --git a/navit/graphics/qt_qpainter/Makefile.am b/navit/graphics/qt_qpainter/Makefile.am index 3e674052..9e06927d 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@ +libgraphics_qt_qpainter_la_LDFLAGS = @QT_GUI_LIBS@ -module 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 86c5aaf8..a3a776b8 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@ +libgraphics_sdl_la_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ -module diff --git a/navit/graphics/win32/Makefile.am b/navit/graphics/win32/Makefile.am index 1368cfe2..9926b601 100644 --- a/navit/graphics/win32/Makefile.am +++ b/navit/graphics/win32/Makefile.am @@ -6,3 +6,4 @@ else noinst_LTLIBRARIES = libgraphics_win32.la endif libgraphics_win32_la_SOURCES = graphics_win32.c xpm2bmp.c +libgraphics_win32_la_LDFLAGS = -module diff --git a/navit/gui/cegui/Makefile.am b/navit/gui/cegui/Makefile.am index 479413f6..b3fc0e0c 100644 --- a/navit/gui/cegui/Makefile.am +++ b/navit/gui/cegui/Makefile.am @@ -4,3 +4,4 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ @CEGUI_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/navit - modulegui_LTLIBRARIES = libgui_cegui.la libgui_cegui_la_SOURCES = gui_sdl_window.cpp sdl_events.cpp gui_sdl.h sdl_events.h wmcontrol.c wmcontrol.h cegui_keyboard.cpp cegui_keyboard.h libgui_cegui_la_LIBADD = @SDL_LIBS@ @CEGUI_LIBS@ @OPENGL_LIBS@ @GLC_LIBS@ +libgui_cegui_la_LDFLAGS = -module diff --git a/navit/gui/clutter/Makefile.am b/navit/gui/clutter/Makefile.am index d6ff882f..982ed220 100644 --- a/navit/gui/clutter/Makefile.am +++ b/navit/gui/clutter/Makefile.am @@ -3,3 +3,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @GLC_CFLAGS@ @CLUTTER_CFLAGS@ modulegui_LTLIBRARIES = libgui_clutter.la libgui_clutter_la_SOURCES = gui_clutter_main.c gui_clutter_animators.c gui_clutter_animators.h gui_clutter_menuhack.c gui_clutter_menuhack.h navit_actor.h navit_actor.c libgui_clutter_la_LIBADD = @CLUTTER_LIBS@ +libgui_clutter_la_LDFLAGS = -module diff --git a/navit/gui/directfb/Makefile.am b/navit/gui/directfb/Makefile.am index 7d45c11f..2cee048c 100644 --- a/navit/gui/directfb/Makefile.am +++ b/navit/gui/directfb/Makefile.am @@ -3,3 +3,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @DIRECTFB_CFLAGS@ -DMODULE=gu modulegui_LTLIBRARIES = libgui_directfb.la libgui_directfb_la_SOURCES = gui_directfb.c gui_directfb.h libgui_directfb_la_LIBADD = @DIRECTFB_LIBS@ +libgui_directfb_la_LDFLAGS = -module diff --git a/navit/gui/gtk/Makefile.am b/navit/gui/gtk/Makefile.am index 4b65eec2..f4156161 100644 --- a/navit/gui/gtk/Makefile.am +++ b/navit/gui/gtk/Makefile.am @@ -3,3 +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 diff --git a/navit/gui/internal/Makefile.am b/navit/gui/internal/Makefile.am index d07de272..dcc366ff 100644 --- a/navit/gui/internal/Makefile.am +++ b/navit/gui/internal/Makefile.am @@ -3,3 +3,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=gui_in modulegui_LTLIBRARIES = libgui_internal.la libgui_internal_la_SOURCES = gui_internal.c libgui_internal_la_LIBADD = @GTK2_LIBS@ +libgui_internal_la_LDFLAGS = -module diff --git a/navit/gui/win32/Makefile.am b/navit/gui/win32/Makefile.am index 74bf7249..794b3283 100644 --- a/navit/gui/win32/Makefile.am +++ b/navit/gui/win32/Makefile.am @@ -7,3 +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 diff --git a/navit/map/binfile/Makefile.am b/navit/map/binfile/Makefile.am index f2089948..ebf820e0 100644 --- a/navit/map/binfile/Makefile.am +++ b/navit/map/binfile/Makefile.am @@ -6,3 +6,4 @@ else noinst_LTLIBRARIES = libmap_binfile.la endif libmap_binfile_la_SOURCES = binfile.c +libmap_binfile_la_LDFLAGS = -module diff --git a/navit/map/garmin/Makefile.am b/navit/map/garmin/Makefile.am index 764671be..46292333 100644 --- a/navit/map/garmin/Makefile.am +++ b/navit/map/garmin/Makefile.am @@ -8,6 +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 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 bd4baae0..c365dfb8 100644 --- a/navit/map/garmin_img/Makefile.am +++ b/navit/map/garmin_img/Makefile.am @@ -2,3 +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 diff --git a/navit/map/mg/Makefile.am b/navit/map/mg/Makefile.am index e408e6bb..38fbb107 100644 --- a/navit/map/mg/Makefile.am +++ b/navit/map/mg/Makefile.am @@ -6,3 +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 diff --git a/navit/map/poi_geodownload/Makefile.am b/navit/map/poi_geodownload/Makefile.am index f2d66805..12d1e5e4 100644 --- a/navit/map/poi_geodownload/Makefile.am +++ b/navit/map/poi_geodownload/Makefile.am @@ -4,3 +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 diff --git a/navit/map/textfile/Makefile.am b/navit/map/textfile/Makefile.am index 486bc257..b7afb324 100644 --- a/navit/map/textfile/Makefile.am +++ b/navit/map/textfile/Makefile.am @@ -6,3 +6,4 @@ else noinst_LTLIBRARIES = libmap_textfile.la endif libmap_textfile_la_SOURCES = textfile.c textfile.h +libmap_textfile_la_LDFLAGS = -module diff --git a/navit/osd/core/Makefile.am b/navit/osd/core/Makefile.am index 4f63f9ad..b891aa49 100644 --- a/navit/osd/core/Makefile.am +++ b/navit/osd/core/Makefile.am @@ -6,3 +6,5 @@ else noinst_LTLIBRARIES = libosd_core.la endif libosd_core_la_SOURCES = osd_core.c +libosd_core_la_LDFLAGS = -module + diff --git a/navit/speech/cmdline/Makefile.am b/navit/speech/cmdline/Makefile.am index f9e50b1a..b4c4c81e 100644 --- a/navit/speech/cmdline/Makefile.am +++ b/navit/speech/cmdline/Makefile.am @@ -2,3 +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 diff --git a/navit/speech/speech_dispatcher/Makefile.am b/navit/speech/speech_dispatcher/Makefile.am index c78f9d20..d88af8e1 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 diff --git a/navit/vehicle/demo/Makefile.am b/navit/vehicle/demo/Makefile.am index d61030b0..062cf14b 100644 --- a/navit/vehicle/demo/Makefile.am +++ b/navit/vehicle/demo/Makefile.am @@ -2,3 +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 diff --git a/navit/vehicle/file/Makefile.am b/navit/vehicle/file/Makefile.am index 9407f581..1205c644 100644 --- a/navit/vehicle/file/Makefile.am +++ b/navit/vehicle/file/Makefile.am @@ -3,5 +3,7 @@ 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 7a52b18f..fde8b867 100644 --- a/navit/vehicle/gpsd/Makefile.am +++ b/navit/vehicle/gpsd/Makefile.am @@ -3,3 +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 diff --git a/navit/vehicle/gypsy/Makefile.am b/navit/vehicle/gypsy/Makefile.am index 8291adb0..37eb8fdc 100644 --- a/navit/vehicle/gypsy/Makefile.am +++ b/navit/vehicle/gypsy/Makefile.am @@ -3,3 +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 diff --git a/navit/vehicle/wince/Makefile.am b/navit/vehicle/wince/Makefile.am index 95204662..b66e3206 100644 --- a/navit/vehicle/wince/Makefile.am +++ b/navit/vehicle/wince/Makefile.am @@ -2,3 +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 |