GpsWidgets: Move from src/ to libs/libgtkgps

diff --git a/libs/Makefile.am b/libs/Makefile.am
index 710bc587c992439c1e5970cb2ba48941f78d0582..a013ff118f77e8b8e059f2adcf07e9bc9139f5df 100644 (file)
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -18,4 +18,4 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-SUBDIRS = libgtkmap libgtkgps
+SUBDIRS = libgtkgps libgtkmap

diff --git a/libs/libgtkgps/Makefile.am b/libs/libgtkgps/Makefile.am
index 8b137891791fe96927ad78e64b0aad7bded08bdc..044c4326627d568e844e2991fc1f6fd581018621 100644 (file)
--- a/libs/libgtkgps/Makefile.am
+++ b/libs/libgtkgps/Makefile.am
@@ -1 +1,31 @@
+#
+# This file is part of mapper
+#
+# Copyright (C) 2008 Kaj-Michael Lang
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
 
+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_LIBADD = $(GLIBGTK_LIBS)
+libgtkgps_la_LDFLAGS = -lm -no-undefined

diff --git a/src/gtkcompass.c b/libs/libgtkgps/gtkcompass.c
similarity index 100%
rename from src/gtkcompass.c
rename to libs/libgtkgps/gtkcompass.c

diff --git a/src/gtkcompass.h b/libs/libgtkgps/gtkcompass.h
similarity index 100%
rename from src/gtkcompass.h
rename to libs/libgtkgps/gtkcompass.h

diff --git a/src/gtkgps.c b/libs/libgtkgps/gtkgps.c
similarity index 100%
rename from src/gtkgps.c
rename to libs/libgtkgps/gtkgps.c

diff --git a/src/gtkgps.h b/libs/libgtkgps/gtkgps.h
similarity index 100%
rename from src/gtkgps.h
rename to libs/libgtkgps/gtkgps.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 15e30216a2dc74b01ce800561916eb094ee6fa24..802e943653d16d6027019fd2b1ec04d9d0958d7f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) $(CAIRO_LIBS) $(GTKGLEXT_LIBS) \
        $(SQLITE_LIBS) $(LIBCURL_LIBS) \
        $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS) \
        $(GYPSY_LIBS) $(LIBGPSBT_LIBS) $(HAL_LIBS)\
-       -lm libgtkgps.la libosmdb.la libmappergps.la ../libs/libgtkmap/libgtkmap.la
+       -lm ../libs/libgtkgps/libgtkgps.la libosmdb.la libmappergps.la ../libs/libgtkmap/libgtkmap.la
 
 mapper_SOURCES = \
        announcements.c \
@@ -118,7 +118,7 @@ osm2db_CFLAGS = $(EXPAT_CFLAGS) $(SQLITE_CFLAGS) $(GLIBGTK_CFLAGS)
 osm2db_LDADD = $(EXPAT_LIBS) $(SQLITE_LIBS) $(GLIBGTK_LIBS) -lm libosmdb.la
 osm2db_SOURCES = osm.c osm.h
 
-lib_LTLIBRARIES = libgtkgps.la libosmdb.la libmappergps.la
+lib_LTLIBRARIES = libosmdb.la libmappergps.la
 
 libmappergps_la_SOURCES = \
        bluetooth-scan.h \
@@ -150,12 +150,6 @@ libmappergps_la_CFLAGS+= $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAG
 libmappergps_la_LIBADD+= $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) $(LIBGPSBT_LIBS)
 endif
 
-libgtkgps_la_SOURCES = gtkgps.c gtkcompass.c \
-                                          gtkgps.h gtkcompass.h gpsdata.h
-libgtkgps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines)
-libgtkgps_la_LIBADD = $(GLIBGTK_LIBS)
-libgtkgps_la_LDFLAGS = -lm -no-undefined
-
 libosmdb_la_SOURCES = db.c osm-db.c osm-db-import.c latlon.c \
                                          db.h osm-db.h osm-db-import.h latlon.h \
                                          osm-sql-tables.h osm.h settings.h