From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 24 Aug 2008 09:31:09 +0000 (+0200)
Subject: Support out-of-tree builds
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99bad12b62e018bcfc3e0434b98936797cb2649d;p=mapper

Support out-of-tree builds
---

diff --git a/libs/libgtkgps/Makefile.am b/libs/libgtkgps/Makefile.am
index 044c432..0d4380a 100644
--- a/libs/libgtkgps/Makefile.am
+++ b/libs/libgtkgps/Makefile.am
@@ -20,12 +20,10 @@
 
 INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE
 
-TOPDIR=../../src
-
 lib_LTLIBRARIES = libgtkgps.la
 
 libgtkgps_la_SOURCES = gtkgps.c gtkcompass.c \
 					   gtkgps.h gtkcompass.h
-libgtkgps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines)
+libgtkgps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines) -I$(top_srcdir)/src
 libgtkgps_la_LIBADD = $(GLIBGTK_LIBS)
 libgtkgps_la_LDFLAGS = -lm -no-undefined
diff --git a/libs/libgtkmap/Makefile.am b/libs/libgtkmap/Makefile.am
index 42e8c74..ac48e40 100644
--- a/libs/libgtkmap/Makefile.am
+++ b/libs/libgtkmap/Makefile.am
@@ -20,7 +20,7 @@
 
 INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE
 
-TOPDIR=../../src
+TOPDIR=$(top_srcdir)/src
 
 bin_PROGRAMS = map_widget_test
 lib_LTLIBRARIES = libgtkmap.la
@@ -30,13 +30,13 @@ libgtkmap_la_SOURCES = gtkmap.c gtkmap.h \
 	path.c path.h position.c position.h \
 	tilerepo.c tilerepo.h \
 	$(TOPDIR)/latlon.c $(TOPDIR)/image-cache.c
-libgtkmap_la_CFLAGS = $(GLIBGTK_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML2_CFLAGS) $(GTKGLEXT_CFLAGS) $(LIBCURL_CFLAGS) $(defines) 
+libgtkmap_la_CFLAGS = $(GLIBGTK_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML2_CFLAGS) $(GTKGLEXT_CFLAGS) $(LIBCURL_CFLAGS) $(defines) -I$(top_srcdir)/src
 libgtkmap_la_LIBADD = $(GLIBGTK_LIBS) $(GNOME_VFS_LIBS) $(LIBXML2_LIBS) $(GTKGLEXT_LIBS) $(LIBCURL_LIBS)
 libgtkmap_la_LDFLAGS = -lm -no-undefined
 
 map_widget_test_SOURCES = map-widget-test.c
 map_widget_test_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) $(CAIRO_LIBS) $(GTKGLEXT_LIBS) -lm libgtkmap.la
-map_widget_test_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) $(CAIRO_CFLAGS) $(GTKGLEXT_CFLAGS)
+map_widget_test_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) $(CAIRO_CFLAGS) $(GTKGLEXT_CFLAGS) -I$(top_srcdir)/src
 
 EXTRA_DIST = gtkmap-marshal.list
 BUILT_SOURCES = gtkmap-marshal.c gtkmap-marshal.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 3761b06..31c937c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE -I../libs/libgtkmap/ -I../libs/libgtkgps
+INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE -I$(top_srcdir)/libs/libgtkmap/ -I$(top_srcdir)/libs/libgtkgps
 
 bin_PROGRAMS = mapper osm2db
 
@@ -120,7 +120,7 @@ libmappergps_la_SOURCES = \
 	gps-nmea-parse.h \
 	path.h
 
-libmappergps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines) 
+libmappergps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines)
 libmappergps_la_LIBADD = $(GLIBGTK_LIBS)
 libmappergps_la_LDFLAGS = -lm -no-undefined