Remove old map sources

[mapper] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 15e30216a2dc74b01ce800561916eb094ee6fa24..92f2c7236531b8f84978f1ba3f3ed375de6e882f 100644 (file)
--- 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/
+INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE -I../libs/libgtkmap/ -I../libs/libgtkgps
 
 bin_PROGRAMS = mapper osm2db
 
@@ -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 \
@@ -63,8 +63,6 @@ mapper_SOURCES = \
        gps-panels.c \
        gps-panels.h \
        gps-conn.c \
-       gpx.c \
-       gpx.h \
        help.c \
        help.h \
        hildon-mapper.h \
@@ -101,7 +99,6 @@ mapper_SOURCES = \
        settings-gui.h \
        speak.c \
        speak.h \
-       speed-display.c \
        ui-common.c \
        ui-common.h \
        ui-maemo.h \
@@ -118,7 +115,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 \
@@ -127,7 +124,6 @@ libmappergps_la_SOURCES = \
        gps-conn.h \
        gps-nmea-parse.c \
        gps-nmea-parse.h \
-       map.h \
        path.h
 
 libmappergps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines) 
@@ -150,12 +146,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