GpsBluez: cleanups

[mapper] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 074f53022d0242fc253ffe258ca43efe397fbeeb..0d0b617ffeef751d97fd3b685a512cf90404fba1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@
 
 INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE
 
-bin_PROGRAMS = mapper osm2db
+bin_PROGRAMS = mapper osm2db map_widget_test
 
 mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) $(CAIRO_CFLAGS) $(GTKGLEXT_CFLAGS) \
        $(OSSO_CFLAGS) $(CONIC_CFLAGS) \
@@ -77,6 +77,8 @@ mapper_SOURCES = \
        map-download.h \
        map-poi.c \
        map-poi.h \
+       map-tile-repo.c \
+       map-tile-repo.h \
        map-repo.c \
        map-repo.h \
        map.c \
@@ -85,6 +87,8 @@ mapper_SOURCES = \
        mapper.h \
        path.c \
        path.h \
+       position.c \
+       position.h \
        image-cache.c \
        image-cache.h \
        poi-gui.c \
@@ -97,9 +101,6 @@ mapper_SOURCES = \
        search.h \
        settings-gui.c \
        settings-gui.h \
-       audio.h \
-       audio-note.c \
-       audio-note.h \
        speak.c \
        speak.h \
        speed-display.c \
@@ -113,11 +114,15 @@ mapper_SOURCES = \
        mapper-types.h \
        settings-gconf.h 
 
+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 osm.h
 
-lib_LTLIBRARIES = libgtkgps.la libosmdb.la libmappergps.la
+lib_LTLIBRARIES = libgtkgps.la libosmdb.la libmappergps.la libgtkmap.la
 
 libmappergps_la_SOURCES = \
        bluetooth-scan.h \
@@ -128,20 +133,36 @@ 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)
 libmappergps_la_LIBADD+= $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) $(LIBGPSBT_LIBS)
 endif
 
+libgtkmap_la_SOURCES = gtkmap.c gtkmap.h gtkmap-marshal.c gtkmap-marshal.h
+libgtkmap_la_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKGLEXT_CFLAGS) $(defines) 
+libgtkmap_la_LIBADD = $(GLIBGTK_LIBS) $(GTKGLEXT_LIBS)
+libgtkmap_la_LDFLAGS = -lm -no-undefined
+
+map_widget_test_SOURCES = map-widget-test.c latlon.c image-cache.c map-tile-repo.c
+map_widget_test_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) $(CAIRO_LIBS) $(GTKGLEXT_LIBS) -lm libgtkgps.la libgtkmap.la
+map_widget_test_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) $(CAIRO_CFLAGS) $(GTKGLEXT_CFLAGS)
+
 libgtkgps_la_SOURCES = gtkgps.c gtkcompass.c \
                                           gtkgps.h gtkcompass.h gpsdata.h
 libgtkgps_la_CFLAGS = $(GLIBGTK_CFLAGS) $(defines)
@@ -155,7 +176,7 @@ libosmdb_la_CFLAGS = $(GLIBGTK_CFLAGS) $(SQLITE_CFLAGS) $(defines)
 libosmdb_la_LIBADD = $(GLIBGTK_LIBS) $(SQLITE_LIBS) $(BZ2_LIBS)
 libosmdb_la_LDFLAGS = -lm -no-undefined
 
-EXTRA_DIST = gps-bluetooth-maemo-marshal.list gps-bluetooth-bluez-marshal.list
+EXTRA_DIST = gps-bluetooth-maemo-marshal.list gps-bluetooth-bluez-marshal.list gtkmap-marshal.list
 
 BUILT_SOURCES = gps-bluetooth-maemo-marshal.h gps-bluetooth-maemo-marshal.c \
        gps-bluetooth-bluez-marshal.h gps-bluetooth-bluez-marshal.c
@@ -172,4 +193,10 @@ gps-bluetooth-bluez-marshal.h: gps-bluetooth-bluez-marshal.list
 gps-bluetooth-bluez-marshal.c: gps-bluetooth-bluez-marshal.list
        glib-genmarshal --prefix _bt_bluez --body $< > $@ 
 
+gtkmap-marshal.c: gtkmap-marshal.list
+       glib-genmarshal --prefix _gtkamp --body $< > $@ 
+
+gtkmap-marshal.h: gtkmap-marshal.list
+       glib-genmarshal --prefix _gtkamp --header $< > $@ 
+
 CLEANFILES = $(BUILT_SOURCES)