From efaeab4cc1e771c7724babc9be573d5856a7592c Mon Sep 17 00:00:00 2001 From: martin-s Date: Thu, 5 Jul 2007 16:50:33 +0000 Subject: [PATCH] Improved make install git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@260 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- Makefile.am | 4 ++-- Makefile.inc | 7 +++++-- src/Makefile.am | 3 ++- src/data/garmin_img/Makefile.am | 2 +- src/data/mg/Makefile.am | 2 +- src/data/textfile/Makefile.am | 2 +- src/graphics/gtk_drawing_area/Makefile.am | 2 +- src/graphics/null/Makefile.am | 2 +- src/graphics/opengl/Makefile.am | 2 +- src/gui/gtk/Makefile.am | 2 +- src/gui/sdl/Makefile.am | 2 +- 11 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 43860cd..701f917 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ +include $(top_srcdir)/Makefile.inc SUBDIRS=src -pkglibplugdir=${pkglibdir}/plugins -pkglib_DATA = README +pkgdoc_DATA = README EXTRA_DIST = README diff --git a/Makefile.inc b/Makefile.inc index a5102f1..4dc3487 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,2 +1,5 @@ -plugindir=$(pkglibdir)/plugins -xpmdir=$(pkglibdir)/xpm +moduleguidir=$(pkglibdir)/gui +modulegraphicsdir=$(pkglibdir)/graphics +moduledatadir=$(pkglibdir)/data +pkgdocdir=$(pkgdatadir) +xpmdir=$(pkgdatadir)/xpm diff --git a/src/Makefile.am b/src/Makefile.am index 3bb6133..4fb3dc5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,4 @@ +include $(top_srcdir)/Makefile.inc SUBDIRS=fib-1.1 data gui graphics xpm AM_CPPFLAGS = -Ifib-1.1 @NAVIT_CFLAGS@ @SPEECHD_CFLAGS@ -DMODULE=\"navit\" @@ -5,7 +6,7 @@ AM_CPPFLAGS = -Ifib-1.1 @NAVIT_CFLAGS@ @SPEECHD_CFLAGS@ -DMODULE=\"navit\" bin_PROGRAMS = navit -pkglib_DATA = navit.xml +pkgdata_DATA = navit.xml EXTRA_DIST = navit.xml navit_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_window.c debug.c \ diff --git a/src/data/garmin_img/Makefile.am b/src/data/garmin_img/Makefile.am index dccc1bd..97fe2f3 100644 --- a/src/data/garmin_img/Makefile.am +++ b/src/data/garmin_img/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -plugin_LTLIBRARIES = libdata_garmin_img.la +moduledata_LTLIBRARIES = libdata_garmin_img.la libdata_garmin_img_la_SOURCES = garmin_img.c diff --git a/src/data/mg/Makefile.am b/src/data/mg/Makefile.am index ba35660..27889da 100644 --- a/src/data/mg/Makefile.am +++ b/src/data/mg/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"data_mg\" -plugin_LTLIBRARIES = libdata_mg.la +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/src/data/textfile/Makefile.am b/src/data/textfile/Makefile.am index d32dea6..0f3b296 100644 --- a/src/data/textfile/Makefile.am +++ b/src/data/textfile/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -plugin_LTLIBRARIES = libdata_textfile.la +moduledata_LTLIBRARIES = libdata_textfile.la libdata_textfile_la_SOURCES = textfile.c textfile.h diff --git a/src/graphics/gtk_drawing_area/Makefile.am b/src/graphics/gtk_drawing_area/Makefile.am index 1a0a210..e7d3d2c 100644 --- a/src/graphics/gtk_drawing_area/Makefile.am +++ b/src/graphics/gtk_drawing_area/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @GTK2_CFLAGS@ -I$(top_srcdir)/src -plugin_LTLIBRARIES = libgraphics_gtk_drawing_area.la +modulegraphics_LTLIBRARIES = libgraphics_gtk_drawing_area.la libgraphics_gtk_drawing_area_la_SOURCES = graphics_gtk_drawing_area.c diff --git a/src/graphics/null/Makefile.am b/src/graphics/null/Makefile.am index ffb869f..270595a 100644 --- a/src/graphics/null/Makefile.am +++ b/src/graphics/null/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -plugin_LTLIBRARIES = libgraphics_null.la +modulegraphics_LTLIBRARIES = libgraphics_null.la libgraphics_null_la_SOURCES = graphics_null.c diff --git a/src/graphics/opengl/Makefile.am b/src/graphics/opengl/Makefile.am index 50080a5..57a64d9 100644 --- a/src/graphics/opengl/Makefile.am +++ b/src/graphics/opengl/Makefile.am @@ -1,4 +1,4 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ @OPENGL_CFLAGS@ -I$(top_srcdir)/src -plugin_LTLIBRARIES = libgraphics_opengl.la +modulegraphics_LTLIBRARIES = libgraphics_opengl.la libgraphics_opengl_la_SOURCES = graphics_opengl.c diff --git a/src/gui/gtk/Makefile.am b/src/gui/gtk/Makefile.am index 2cb3c28..469c2a5 100644 --- a/src/gui/gtk/Makefile.am +++ b/src/gui/gtk/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"gui_gtk\" -plugin_LTLIBRARIES = libgui_gtk.la +modulegui_LTLIBRARIES = libgui_gtk.la libgui_gtk_la_SOURCES = 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/src/gui/sdl/Makefile.am b/src/gui/sdl/Makefile.am index 030721e..f8303fb 100644 --- a/src/gui/sdl/Makefile.am +++ b/src/gui/sdl/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.inc AM_CPPFLAGS = @NAVIT_CFLAGS@ @CEGUI_CFLAGS@ -I$(top_srcdir)/src -plugin_LTLIBRARIES = libgui_sdl.la +modulegui_LTLIBRARIES = libgui_sdl.la libgui_sdl_la_SOURCES = gui_sdl_window.cpp sdl_events.cpp gui_sdl.h sdl_events.h libgui_sdl_la_LIBADD = @SDL_LIBS@ @CEGUI_LIBS@ @OPENGL_LIBS@ -- 1.7.9.5