Remove old map sources

[mapper] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a09595d3ab6c252dfbe76b03adc027a566c86fa1..92f2c7236531b8f84978f1ba3f3ed375de6e882f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,11 +19,11 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE
+INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE -I../libs/libgtkmap/ -I../libs/libgtkgps
 
 bin_PROGRAMS = mapper osm2db
 
-mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) \
+mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) $(CAIRO_CFLAGS) $(GTKGLEXT_CFLAGS) \
        $(OSSO_CFLAGS) $(CONIC_CFLAGS) \
        $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAGS) $(OSSO_HELP_CFLAGS) \
        $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) \
@@ -31,21 +31,21 @@ mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) \
        $(SQLITE_CFLAGS) $(LIBCURL_CFLAGS) \
        $(DBUS_GLIB_CFLAGS) \
        $(BLUEZ_CFLAGS) $(LIBGPSBT_CFLAGS) \
-       $(GYPSY_CFLAGS)
+       $(GYPSY_CFLAGS) $(HAL_CFLAGS)
 
-mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) \
+mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) $(CAIRO_LIBS) $(GTKGLEXT_LIBS) \
        $(OSSO_LIBS) $(CONIC_LIBS) \
        $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) $(OSSO_HELP_LIBS) \
        $(GNOME_VFS_LIBS) $(GCONF_LIBS) \
        $(LIBXML2_LIBS) $(GSTREAMER_LIBS) $(ESPEAK_LIBS) \
        $(SQLITE_LIBS) $(LIBCURL_LIBS) \
        $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS) \
-       $(GYPSY_LIBS) $(LIBGPSBT_LIBS) \
-       -lm libgtkgps.la libosmdb.la libmappergps.la
+       $(GYPSY_LIBS) $(LIBGPSBT_LIBS) $(HAL_LIBS)\
+       -lm ../libs/libgtkgps/libgtkgps.la libosmdb.la libmappergps.la ../libs/libgtkmap/libgtkmap.la
 
 mapper_SOURCES = \
        announcements.c \
-       announcements.h \       
+       announcements.h \
        cb.c \
        cb.h \
        config-gconf.c \
@@ -57,13 +57,12 @@ mapper_SOURCES = \
        filter.c \
        filter.h \
        filter-gui.c \
+       filter-gui.h \
        import-gui.c \
        gps-browse.c \
        gps-panels.c \
        gps-panels.h \
        gps-conn.c \
-       gpx.c \
-       gpx.h \
        help.c \
        help.h \
        hildon-mapper.h \
@@ -76,42 +75,47 @@ mapper_SOURCES = \
        map-download.h \
        map-poi.c \
        map-poi.h \
+       map-tile-repo.c \
+       map-tile-repo.h \
        map-repo.c \
-       map.c \
-       map.h \
+       map-repo.h \
        mapper.c \
        mapper.h \
        path.c \
        path.h \
+       position.c \
+       position.h \
+       route.c \
+       route.h \
+       image-cache.c \
+       image-cache.h \
        poi-gui.c \
        poi-gui.h \
        poi.c \
        poi.h \
-       route.c \
-       route.h \
        search.c \
        search.h \
        settings-gui.c \
        settings-gui.h \
        speak.c \
        speak.h \
-       speed-display.c \
-       track.c \
-       track.h \
        ui-common.c \
        ui-common.h \
        ui-maemo.h \
        utils.c \
-       utils.h
+       utils.h \
+       mapper-types.h \
+       settings-gconf.h 
 
-
-# audio-note.c
+if HAVE_GST
+mapper_SOURCES+=audio.h audio-note.c audio-note.h
+endif
 
 osm2db_CFLAGS = $(EXPAT_CFLAGS) $(SQLITE_CFLAGS) $(GLIBGTK_CFLAGS)
 osm2db_LDADD = $(EXPAT_LIBS) $(SQLITE_LIBS) $(GLIBGTK_LIBS) -lm libosmdb.la
-osm2db_SOURCES = osm.c
+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 \
@@ -120,31 +124,31 @@ libmappergps_la_SOURCES = \
        gps-conn.h \
        gps-nmea-parse.c \
        gps-nmea-parse.h \
-       map.h \
        path.h
-if HAVE_BLUEZ_DBUS_BT
-libmappergps_la_SOURCES+=gps-bluetooth-bluez.c gps-bluetooth-bluez-marshal.c
-endif
 
 libmappergps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines) 
 libmappergps_la_LIBADD = $(GLIBGTK_LIBS)
 libmappergps_la_LDFLAGS = -lm -no-undefined
 
+# Old C lib
+if HAVE_BLUEZ
+libmappergps_la_SOURCES+=gps-bluetooth-bluez.c
+endif
+
+# New D-Bus based bluez
+if HAVE_BLUEZ_DBUS_BT
+libmappergps_la_SOURCES+=gps-bluetooth-bluez-dbus.c gps-bluetooth-bluez-marschal.h gps-bluetooth-bluez-marshal.c
+endif
+
 if HAVE_HILDON_DBUS_BT
 libmappergps_la_SOURCES+=gps-bluetooth-maemo.c gps-bluetooth-maemo-marshal.c 
 libmappergps_la_CFLAGS+= $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAGS) $(LIBGPSBT_CFLAGS)
 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-sql-tables.h osm.h settings.h
 libosmdb_la_CFLAGS = $(GLIBGTK_CFLAGS) $(SQLITE_CFLAGS) $(defines)
 libosmdb_la_LIBADD = $(GLIBGTK_LIBS) $(SQLITE_LIBS) $(BZ2_LIBS)
 libosmdb_la_LDFLAGS = -lm -no-undefined