Build:

- Add and handle gtkmap-marshal.list
- Don't build audio notes if gst is not enabled

diff --git a/src/Makefile.am b/src/Makefile.am
index 0845779998a9a48ab7817888101735c00c576cde..2cb6bc81db401b9c4dc18c9385103aff7225d13b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,9 +99,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 \
@@ -115,6 +112,10 @@ 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
@@ -144,7 +145,7 @@ libmappergps_la_CFLAGS+= $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAG
 libmappergps_la_LIBADD+= $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) $(LIBGPSBT_LIBS)
 endif
 
-libgtkmap_la_SOURCES = gtkmap.c gtkmap.h
+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
@@ -166,7 +167,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
@@ -183,4 +184,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)

diff --git a/src/gtkmap-marshal.list b/src/gtkmap-marshal.list
new file mode 100644 (file)
index 0000000..b9b8548
--- /dev/null
+++ b/src/gtkmap-marshal.list
@@ -0,0 +1 @@
+VOID:DOUBLE,DOUBLE