Build: link with libgtkmap

[mapper] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 2cb6bc81db401b9c4dc18c9385103aff7225d13b..ab3b60daf2716bc6b1ad906d6953cb6ac2297d95 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
+       -lm libgtkgps.la libosmdb.la libmappergps.la libgtkmap.la
 
 mapper_SOURCES = \
        announcements.c \
@@ -81,20 +81,18 @@ mapper_SOURCES = \
        map-tile-repo.h \
        map-repo.c \
        map-repo.h \
-       map.c \
-       map.h \
        mapper.c \
        mapper.h \
        path.c \
        path.h \
+       position.c \
+       position.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 \
@@ -102,8 +100,6 @@ mapper_SOURCES = \
        speak.c \
        speak.h \
        speed-display.c \
-       track.c \
-       track.h \
        ui-common.c \
        ui-common.h \
        ui-maemo.h \
@@ -131,14 +127,21 @@ libmappergps_la_SOURCES = \
        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)