Move path stuff into map widget

diff --git a/libs/libgtkmap/Makefile.am b/libs/libgtkmap/Makefile.am
index 21949bcf558cf993517edcd8d7f6e5440d924566..176300beb076a1bf2eea4399882b9bda6c327d03 100644 (file)
--- 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 70d89c2c856930237b619a1775882cffc679ae22..f589f24af973b00c27217e1cfe829869a7c8640f 100644 (file)
--- 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 \