From: Kaj-Michael Lang <milang@tal.org>
Date: Thu, 12 Jun 2008 11:34:51 +0000 (+0300)
Subject: Move path stuff into map widget
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d45df14eaae3c6f12aec3497fa1492cfbed05850;p=mapper

Move path stuff into map widget
---

diff --git a/libs/libgtkmap/Makefile.am b/libs/libgtkmap/Makefile.am
index 21949bc..176300b 100644
--- a/libs/libgtkmap/Makefile.am
+++ b/libs/libgtkmap/Makefile.am
@@ -25,9 +25,12 @@ TOPDIR=../../src
 bin_PROGRAMS = map_widget_test
 lib_LTLIBRARIES = libgtkmap.la
 
-libgtkmap_la_SOURCES = gtkmap.c gtkmap.h gtkmap-marshal.c gtkmap-marshal.h $(TOPDIR)/latlon.c $(TOPDIR)/image-cache.c
-libgtkmap_la_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKGLEXT_CFLAGS) $(defines) 
-libgtkmap_la_LIBADD = $(GLIBGTK_LIBS) $(GTKGLEXT_LIBS)
+libgtkmap_la_SOURCES = gtkmap.c gtkmap.h \
+	gtkmap-marshal.c gtkmap-marshal.h \
+	path.c path.h \
+	$(TOPDIR)/latlon.c $(TOPDIR)/image-cache.c
+libgtkmap_la_CFLAGS = $(GLIBGTK_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML2_CFLAGS) $(GTKGLEXT_CFLAGS) $(defines) 
+libgtkmap_la_LIBADD = $(GLIBGTK_LIBS) $(GNOME_VFS_LIBS) $(LIBXML2_LIBS) $(GTKGLEXT_LIBS)
 libgtkmap_la_LDFLAGS = -lm -no-undefined
 
 map_widget_test_SOURCES = map-widget-test.c $(TOPDIR)/map-tile-repo.c
diff --git a/src/path.c b/libs/libgtkmap/path.c
similarity index 100%
rename from src/path.c
rename to libs/libgtkmap/path.c
diff --git a/src/path.h b/libs/libgtkmap/path.h
similarity index 100%
rename from src/path.h
rename to libs/libgtkmap/path.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 70d89c2..f589f24 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,8 +81,6 @@ mapper_SOURCES = \
 	map-repo.h \
 	mapper.c \
 	mapper.h \
-	path.c \
-	path.h \
 	position.c \
 	position.h \
 	path-mapper.c \