make distcheck fixes.

Mostly based on a patch sent by Rodrigo Moya.

diff --git a/Makefile.am b/Makefile.am
index 872765cf5ed2c4843c53971bd7b102bad993e075..90eced3059fb890a31b1b90ad62981f47a9a64be 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = \
         intltool-extract.in \
         intltool-merge.in \
         intltool-update.in \
-        debian/changelog \
+        debian/changelog.in \
         debian/compat \
         debian/copyright  \
         debian/control \
@@ -31,3 +31,5 @@ EXTRA_DIST = \
         debian/mapper.links
 
 SUBDIRS = src data po
+
+CLEANFILES = intltool-extract intltool-merge intltool-update

diff --git a/data/Makefile.am b/data/Makefile.am
index f0c7a79ea8e1eb9035e7b884b45a2e8eef75dbc8..e8bdbee53db9b1cd4e283c2a9cde3d92a883c587 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -60,3 +60,5 @@ if GCONF_SCHEMAS_INSTALL
        done \
        fi
 endif
+
+CLEANFILES = mapper.schemas

diff --git a/po/POTFILES.in b/po/POTFILES.in
index df99b5bf6d8ab923dd8637474817b55fc3feacba..bbb1f551b535fa56a6144d5f390f5993a6d67036 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,14 +1,13 @@
+data/mapper.schemas.in
 src/gps-nmea-parse.c
 src/db.c
 src/route.c
-src/audio-note.c
 src/gps-conn.c
 src/announcements.c
 src/filter-gui.c
 src/map-poi.c
 src/gps-bluetooth-bluez-marshal.c
 src/gps-browse.c
-src/bt-maemo-marshal.c
 src/utils.c
 src/map-repo.c
 src/gtkgps.c
@@ -18,7 +17,6 @@ src/filter.c
 src/cb.c
 src/search.c
 src/ui-common.c
-src/gps-bluetooth-hildon.c
 src/gps-bluetooth-maemo-marshal.c
 src/gps-panels.c
 src/poi-gui.c
@@ -30,7 +28,6 @@ src/map-download.c
 src/config-gconf.c
 src/file.c
 src/speed-display.c
-src/gps-bluetooth-bluez-dbus.c
 src/hildon-wrappers.c
 src/speak.c
 src/gps-bluetooth-bluez.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 879e0e07d875d55671b834171db70bee15165de3..f25cf07b609d424bcbd881f763f8766bae45c33d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,37 +43,66 @@ mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) \
        $(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 \
+       file.h \
        filter.c \
+       filter.h \
+       filter-gui.c \
        gps-browse.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.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 \
+       speak.c \
+       speak.h \
        speed-display.c \
-       hildon-wrappers.c \
+       track.c \
+       track.h \
        ui-common.c \
-       dialogs.c \
-       config-gconf.c \
-       speak.c \
-       announcements.c \
-       help.c \
-       search.c \
-       mapper.c
+       ui-common.h \
+       ui-maemo.h \
+       utils.c \
+       utils.h
+
 
 # audio-note.c
 
@@ -83,7 +112,15 @@ osm2db_SOURCES = osm.c
 
 lib_LTLIBRARIES = libgtkgps.la libosmdb.la libmappergps.la
 
-libmappergps_la_SOURCES = gps.c        gps-nmea-parse.c
+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
 libmappergps_la_SOURCES+=gps-bluetooth-bluez.c gps-bluetooth-bluez-marshal.c
 endif
@@ -98,12 +135,15 @@ libmappergps_la_CFLAGS+= $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAG
 libmappergps_la_LIBADD+= $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) $(LIBGPSBT_LIBS)
 endif
 
-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 osm-db-import.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
 libosmdb_la_CFLAGS = $(GLIBGTK_CFLAGS) $(SQLITE_CFLAGS) $(defines)
 libosmdb_la_LIBADD = $(GLIBGTK_LIBS) $(SQLITE_LIBS) $(BZ2_LIBS)
 libosmdb_la_LDFLAGS = -lm -no-undefined
@@ -124,3 +164,5 @@ 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 $< > $@ 
+
+CLEANFILES = $(BUILT_SOURCES)