Add header and cast properly.

[mapper] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cc8afd871ce75c26208c1f93e4eed81675205433..ca73c112aaac7cca7b6a2bcc840c4d8b00f17302 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) \
        $(LIBXML2_CFLAGS) $(GSTREAMER_CFLAGS) $(ESPEAK_CFLAGS) \
        $(SQLITE_CFLAGS) $(LIBCURL_CFLAGS) \
        $(DBUS_GLIB_CFLAGS) \
-       $(BLUEZ_CFLAGS) \
+       $(BLUEZ_CFLAGS) $(LIBGPSBT_CFLAGS) \
        $(GYPSY_CFLAGS)
 
 mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) \
@@ -40,79 +40,134 @@ mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) \
        $(LIBXML2_LIBS) $(GSTREAMER_LIBS) $(ESPEAK_LIBS) \
        $(SQLITE_LIBS) $(LIBCURL_LIBS) \
        $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS) \
-       $(GYPSY_LIBS) \
-       -lm libgtkgps.la libosmdb.la
+       $(GYPSY_LIBS) $(LIBGPSBT_LIBS) \
+       -lm libgtkgps.la libosmdb.la libmappergps.la
 
-mapper_SOURCES = utils.c \
+mapper_SOURCES = \
+       announcements.c \
+       announcements.h \
+       cb.c \
+       cb.h \
+       config-gconf.c \
+       config-gconf.h \
+       dialogs.c \
+       dialogs.h \
        file.c \
-       gpx.c \
-       gps.c \
+       file.h \
+       filter.c \
+       filter.h \
+       filter-gui.c \
+       filter-gui.h \
+       import-gui.c \
        gps-browse.c \
-       gps-nmea-parse.c \
        gps-panels.c \
+       gps-panels.h \
        gps-conn.c \
-       cb.c \
+       gpx.c \
+       gpx.h \
+       help.c \
+       help.h \
+       hildon-mapper.h \
+       hildon-wrappers.c \
+       hildon-wrappers.h \
        iap.c \
-       path.c \
-       route.c \
-       track.c \
+       iap.h \
        maemo-osso.c \
-       map-repo.c \
        map-download.c \
+       map-download.h \
+       map-poi.c \
+       map-poi.h \
+       map-repo.c \
+       map-repo.h \
        map.c \
-       poi.c \
+       map.h \
+       mapper.c \
+       mapper.h \
+       path.c \
+       path.h \
        poi-gui.c \
-       map-poi.c \
+       poi-gui.h \
+       poi.c \
+       poi.h \
+       route.c \
+       route.h \
+       search.c \
+       search.h \
        settings-gui.c \
-       filter-gui.c \
+       settings-gui.h \
+       audio.h \
+       audio-note.c \
+       audio-note.h \
+       speak.c \
+       speak.h \
        speed-display.c \
-       hildon-wrappers.c \
+       track.c \
+       track.h \
        ui-common.c \
-       config-gconf.c \
-       speak.c \
-       announcements.c \
-       audio-note.c \
-       help.c \
-       search.c \
-       mapper.c
+       ui-common.h \
+       ui-maemo.h \
+       utils.c \
+       utils.h \
+       mapper-types.h \
+       settings-gconf.h 
+
+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
 
+libmappergps_la_SOURCES = \
+       bluetooth-scan.h \
+       gps.c \
+       gps.h \
+       gps-conn.h \
+       gps-nmea-parse.c \
+       gps-nmea-parse.h \
+       map.h \
+       path.h
 if HAVE_BLUEZ_DBUS_BT
-mapper_SOURCES+=gps-bluetooth-bluez.c 
+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
+
 if HAVE_HILDON_DBUS_BT
-mapper_SOURCES+=gps-bluetooth-maemo.c gps-bluetooth-maemo-marshal.c 
+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
 
-#if HAVE_GPSD
-#mapper_SOURCES+=gps-gpsd.c
-#endif
-
-#if HAVE_GYPSY
-#mapper_SOURCES+=gps-gypsy.c
-#endif
-
-osm2db_CFLAGS = $(EXPAT_CFLAGS) $(SQLITE_CFLAGS) $(GLIBGTK_CFLAGS)
-osm2db_LDADD = $(EXPAT_LIBS) $(SQLITE_LIBS) $(GLIBGTK_LIBS) $(BZ2_LIBS) -lm libosmdb.la
-osm2db_SOURCES = osm.c
-
-lib_LTLIBRARIES = libgtkgps.la libosmdb.la
-
-libgtkgps_la_SOURCES = gtkgps.c gtkcompass.c
+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 latlon.c
+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
 libosmdb_la_CFLAGS = $(GLIBGTK_CFLAGS) $(SQLITE_CFLAGS) $(defines)
-libosmdb_la_LIBADD = $(GLIBGTK_LIBS) $(SQLITE_LIBS)
+libosmdb_la_LIBADD = $(GLIBGTK_LIBS) $(SQLITE_LIBS) $(BZ2_LIBS)
 libosmdb_la_LDFLAGS = -lm -no-undefined
 
-EXTRA_DIST = gps-bluetooth-maemo-marshal.list
+EXTRA_DIST = gps-bluetooth-maemo-marshal.list gps-bluetooth-bluez-marshal.list
 
-BUILT_SOURCES = gps-bluetooth-maemo-marshal.h gps-bluetooth-maemo-marshal.c
+BUILT_SOURCES = gps-bluetooth-maemo-marshal.h gps-bluetooth-maemo-marshal.c \
+       gps-bluetooth-bluez-marshal.h gps-bluetooth-bluez-marshal.c
 
 gps-bluetooth-maemo-marshal.h: gps-bluetooth-maemo-marshal.list
        glib-genmarshal --prefix _bt_maemo --header $< > $@ 
+
 gps-bluetooth-maemo-marshal.c: gps-bluetooth-maemo-marshal.list
        glib-genmarshal --prefix _bt_maemo --body $< > $@ 
+
+gps-bluetooth-bluez-marshal.h: gps-bluetooth-bluez-marshal.list
+       glib-genmarshal --prefix _bt_bluez --header $< > $@ 
+
+gps-bluetooth-bluez-marshal.c: gps-bluetooth-bluez-marshal.list
+       glib-genmarshal --prefix _bt_bluez --body $< > $@ 
+
+CLEANFILES = $(BUILT_SOURCES)