From 05535fffac157a06d3ca69693a5b0368dfb9731c Mon Sep 17 00:00:00 2001 From: martin-s Date: Sun, 18 May 2008 10:10:39 +0000 Subject: [PATCH] Fix:Core:Changed remaining Makefiles git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1060 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/binding/dbus/Makefile.am | 2 +- navit/navit/binding/python/Makefile.am | 2 +- navit/navit/data/binfile/Makefile.am | 2 +- navit/navit/data/garmin/Makefile.am | 6 +++--- navit/navit/data/garmin_img/Makefile.am | 2 +- navit/navit/data/mg/Makefile.am | 2 +- navit/navit/data/poi_geodownload/Makefile.am | 2 +- navit/navit/data/textfile/Makefile.am | 2 +- navit/navit/graphics/gtk_drawing_area/Makefile.am | 2 +- navit/navit/graphics/null/Makefile.am | 2 +- navit/navit/graphics/opengl/Makefile.am | 2 +- navit/navit/graphics/qt_qpainter/Makefile.am | 2 +- navit/navit/gui/gtk/Makefile.am | 2 +- navit/navit/gui/internal/Makefile.am | 2 +- navit/navit/gui/sdl/Makefile.am | 2 +- navit/navit/osd/core/Makefile.am | 2 +- navit/navit/speech/cmdline/Makefile.am | 2 +- navit/navit/speech/speech_dispatcher/Makefile.am | 2 +- navit/navit/vehicle/demo/Makefile.am | 2 +- navit/navit/vehicle/file/Makefile.am | 2 +- navit/navit/vehicle/gpsd/Makefile.am | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/navit/navit/binding/dbus/Makefile.am b/navit/navit/binding/dbus/Makefile.am index 55b7b29..72d8ef3 100644 --- a/navit/navit/binding/dbus/Makefile.am +++ b/navit/navit/binding/dbus/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/src -DMODULE=binding_dbus +AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=binding_dbus modulebinding_LTLIBRARIES = libbinding_dbus.la libbinding_dbus_la_SOURCES = binding_dbus.c libbinding_dbus_la_LIBADD = @DBUS_LIBS@ diff --git a/navit/navit/binding/python/Makefile.am b/navit/navit/binding/python/Makefile.am index 6374920..1d79119 100644 --- a/navit/navit/binding/python/Makefile.am +++ b/navit/navit/binding/python/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ @PYTHON_CFLAGS@ -I$(top_srcdir)/src -DMODULE=binding_python +AM_CPPFLAGS = @NAVIT_CFLAGS@ @PYTHON_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=binding_python modulebinding_LTLIBRARIES = libbinding_python.la libbinding_python_la_SOURCES = binding_python.c libbinding_python_la_LIBADD = @PYTHON_LIBS@ diff --git a/navit/navit/data/binfile/Makefile.am b/navit/navit/data/binfile/Makefile.am index 69e26f5..e145749 100644 --- a/navit/navit/data/binfile/Makefile.am +++ b/navit/navit/data/binfile/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=data_binfile +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_binfile moduledata_LTLIBRARIES = libdata_binfile.la libdata_binfile_la_SOURCES = binfile.c diff --git a/navit/navit/data/garmin/Makefile.am b/navit/navit/data/garmin/Makefile.am index 800e6df..9d98fb2 100644 --- a/navit/navit/data/garmin/Makefile.am +++ b/navit/navit/data/garmin/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=data_garmin +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_garmin AM_CPPFLAGS+= @LIBGARMIN_CFLAGS@ -INCLUDES=-I$(top_srcdir)/src/data/garmin/libgarmin -AM_CPPFLAGS+=-I$(top_srcdir)/src/data/garmin/libgarmin +INCLUDES=-I$(top_srcdir)/navit/data/garmin/libgarmin +AM_CPPFLAGS+=-I$(top_srcdir)/navit/data/garmin/libgarmin AM_CPPFLAGS+=-I$(srcdir) moduledata_LTLIBRARIES = libdata_garmin.la diff --git a/navit/navit/data/garmin_img/Makefile.am b/navit/navit/data/garmin_img/Makefile.am index c48ea39..9e50c62 100644 --- a/navit/navit/data/garmin_img/Makefile.am +++ b/navit/navit/data/garmin_img/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=data_garmin_img +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_garmin_img moduledata_LTLIBRARIES = libdata_garmin_img.la libdata_garmin_img_la_SOURCES = garmin_img.c diff --git a/navit/navit/data/mg/Makefile.am b/navit/navit/data/mg/Makefile.am index 04d92b0..1d59e3c 100644 --- a/navit/navit/data/mg/Makefile.am +++ b/navit/navit/data/mg/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=data_mg +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_mg moduledata_LTLIBRARIES = libdata_mg.la libdata_mg_la_SOURCES = map.c block.c town.c tree.c poly.c street.c mg.h diff --git a/navit/navit/data/poi_geodownload/Makefile.am b/navit/navit/data/poi_geodownload/Makefile.am index 6c329b8..41f25d5 100644 --- a/navit/navit/data/poi_geodownload/Makefile.am +++ b/navit/navit/data/poi_geodownload/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS=libmdb include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -I$(srcdir)/libmdb/include -DMODULE=data_poi_geodownload +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -I$(srcdir)/libmdb/include -DMODULE=data_poi_geodownload moduledata_LTLIBRARIES = libdata_poi_geodownload.la libdata_poi_geodownload_la_SOURCES = poi_geodownload.c libdata_poi_geodownload_la_LIBADD = -Llibmdb -lmdb diff --git a/navit/navit/data/textfile/Makefile.am b/navit/navit/data/textfile/Makefile.am index afbc47d..495eb68 100644 --- a/navit/navit/data/textfile/Makefile.am +++ b/navit/navit/data/textfile/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=data_textfile +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_textfile moduledata_LTLIBRARIES = libdata_textfile.la libdata_textfile_la_SOURCES = textfile.c textfile.h diff --git a/navit/navit/graphics/gtk_drawing_area/Makefile.am b/navit/navit/graphics/gtk_drawing_area/Makefile.am index bb0ef09..ec6f642 100644 --- a/navit/navit/graphics/gtk_drawing_area/Makefile.am +++ b/navit/navit/graphics/gtk_drawing_area/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @GTK2_CFLAGS@ @FREETYPE2_CFLAGS@ @FONTCONFIG_CFLAGS@ -I$(top_srcdir)/src -DMODULE=graphics_gtk_drawing_area +AM_CPPFLAGS = @GTK2_CFLAGS@ @FREETYPE2_CFLAGS@ @FONTCONFIG_CFLAGS@ -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@ @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ @IMLIB2_LIBS@ diff --git a/navit/navit/graphics/null/Makefile.am b/navit/navit/graphics/null/Makefile.am index c1e93de..88c0e69 100644 --- a/navit/navit/graphics/null/Makefile.am +++ b/navit/navit/graphics/null/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=graphics_null +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_null modulegraphics_LTLIBRARIES = libgraphics_null.la libgraphics_null_la_SOURCES = graphics_null.c diff --git a/navit/navit/graphics/opengl/Makefile.am b/navit/navit/graphics/opengl/Makefile.am index a445357..b0a25f3 100644 --- a/navit/navit/graphics/opengl/Makefile.am +++ b/navit/navit/graphics/opengl/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ @OPENGL_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/src -DMODULE=graphics_opengl +AM_CPPFLAGS = @NAVIT_CFLAGS@ @OPENGL_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_opengl modulegraphics_LTLIBRARIES = libgraphics_opengl.la libgraphics_opengl_la_SOURCES = graphics_opengl.c libgraphics_opengl_la_LIBADD = @OPENGL_LIBS@ @GLC_LIBS@ diff --git a/navit/navit/graphics/qt_qpainter/Makefile.am b/navit/navit/graphics/qt_qpainter/Makefile.am index 228236d..4f35354 100644 --- a/navit/navit/graphics/qt_qpainter/Makefile.am +++ b/navit/navit/graphics/qt_qpainter/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @QT_GUI_CFLAGS@ @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=graphics_qt_qpainter +AM_CPPFLAGS = @QT_GUI_CFLAGS@ @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_qt_qpainter modulegraphics_LTLIBRARIES = libgraphics_qt_qpainter.la libgraphics_qt_qpainter_la_SOURCES = graphics_qt_qpainter.cpp libgraphics_qt_qpainter_la_LDFLAGS = @QT_GUI_LIBS@ diff --git a/navit/navit/gui/gtk/Makefile.am b/navit/navit/gui/gtk/Makefile.am index 128a3fb..5d34b15 100644 --- a/navit/navit/gui/gtk/Makefile.am +++ b/navit/navit/gui/gtk/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = -I$(top_srcdir)/src @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=gui_gtk +AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=gui_gtk 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@ diff --git a/navit/navit/gui/internal/Makefile.am b/navit/navit/gui/internal/Makefile.am index 3108056..d07de27 100644 --- a/navit/navit/gui/internal/Makefile.am +++ b/navit/navit/gui/internal/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = -I$(top_srcdir)/src @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=gui_internal +AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=gui_internal modulegui_LTLIBRARIES = libgui_internal.la libgui_internal_la_SOURCES = gui_internal.c libgui_internal_la_LIBADD = @GTK2_LIBS@ diff --git a/navit/navit/gui/sdl/Makefile.am b/navit/navit/gui/sdl/Makefile.am index 795e35e..f5777f2 100644 --- a/navit/navit/gui/sdl/Makefile.am +++ b/navit/navit/gui/sdl/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.inc SUBDIRS=datafiles -AM_CPPFLAGS = @NAVIT_CFLAGS@ @CEGUI_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/src -DMODULE=gui_sdl +AM_CPPFLAGS = @NAVIT_CFLAGS@ @CEGUI_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=gui_sdl modulegui_LTLIBRARIES = libgui_sdl.la libgui_sdl_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_sdl_la_LIBADD = @SDL_LIBS@ @CEGUI_LIBS@ @OPENGL_LIBS@ @GLC_LIBS@ diff --git a/navit/navit/osd/core/Makefile.am b/navit/navit/osd/core/Makefile.am index cacb417..8e731e4 100644 --- a/navit/navit/osd/core/Makefile.am +++ b/navit/navit/osd/core/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=osd_core +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=osd_core moduleosd_LTLIBRARIES = libosd_core.la libosd_core_la_SOURCES = osd_core.c diff --git a/navit/navit/speech/cmdline/Makefile.am b/navit/navit/speech/cmdline/Makefile.am index 592990c..f9e50b1 100644 --- a/navit/navit/speech/cmdline/Makefile.am +++ b/navit/navit/speech/cmdline/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=speech_cmdline +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_cmdline modulespeech_LTLIBRARIES = libspeech_cmdline.la libspeech_cmdline_la_SOURCES = speech_cmdline.c diff --git a/navit/navit/speech/speech_dispatcher/Makefile.am b/navit/navit/speech/speech_dispatcher/Makefile.am index 3980e90..c78f9d2 100644 --- a/navit/navit/speech/speech_dispatcher/Makefile.am +++ b/navit/navit/speech/speech_dispatcher/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=speech_speech_dispatcher +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_speech_dispatcher modulespeech_LTLIBRARIES = libspeech_speech_dispatcher.la libspeech_speech_dispatcher_la_SOURCES = speech_speech_dispatcher.c libspeech_speech_dispatcher_la_LIBADD = @SPEECHD_LIBS@ diff --git a/navit/navit/vehicle/demo/Makefile.am b/navit/navit/vehicle/demo/Makefile.am index 3f2f4f3..d61030b 100644 --- a/navit/navit/vehicle/demo/Makefile.am +++ b/navit/navit/vehicle/demo/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=vehicle_demo +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_demo modulevehicle_LTLIBRARIES = libvehicle_demo.la libvehicle_demo_la_SOURCES = vehicle_demo.c diff --git a/navit/navit/vehicle/file/Makefile.am b/navit/navit/vehicle/file/Makefile.am index f46da84..51064ad 100644 --- a/navit/navit/vehicle/file/Makefile.am +++ b/navit/navit/vehicle/file/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=vehicle_file +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_file modulevehicle_LTLIBRARIES = libvehicle_file.la libvehicle_file_la_SOURCES = vehicle_file.c diff --git a/navit/navit/vehicle/gpsd/Makefile.am b/navit/navit/vehicle/gpsd/Makefile.am index db7a686..b41529b 100644 --- a/navit/navit/vehicle/gpsd/Makefile.am +++ b/navit/navit/vehicle/gpsd/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=vehicle_gpsd +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_gpsd modulevehicle_LTLIBRARIES = libvehicle_gpsd.la libvehicle_gpsd_la_SOURCES = vehicle_gpsd.c libvehicle_gpsd_la_LIBADD = @GPSD_LIBS@ -- 2.7.4