From: Kaj-Michael Lang Date: Mon, 6 Aug 2007 13:19:08 +0000 (+0300) Subject: Fix building under maemo sdk X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a58ebeeb7c07b88d14ebe8c8fd4e4dcd49cc19d;p=mapper Fix building under maemo sdk --- diff --git a/configure.ac b/configure.ac index d59f418..8d37d7b 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_CONFIG_HEADERS(src/config.h) AC_PROG_INSTALL AC_PROG_LIBTOOL AC_SYS_LARGEFILE -PKG_PROG_PKG_CONFIG +dnl PKG_PROG_PKG_CONFIG dnl Debugging options to enable debug macros DEBUG_FLAGS= diff --git a/debian/changelog b/debian/changelog index 5561b2c..464040a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ mapper (1.0.0) unstable; urgency=low - * Fork maemo-mapper to just mapper + * Fork maemo-mapper * Split the big source file into smaller parts * Cache POI icons * Support both normal Gtk/GNOME desktop and Maemo/Hildon environments * Add toolbar with commonly used function for easy finger access + * Add utility to import OpenStreetMap .osm files to sqlite3 database + * Use OpenStreetMap data to display location information + * See sources for more... - -- Kaj-Michael Lang Sun, 28 May 2007 14:44:00 +0200 + -- Kaj-Michael Lang Sun, 25 Jul 2007 20:45:00 +0200 maemo-mapper (1.4.4) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 56a7e74..ea6be35 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,9 @@ -Copyright (c) 2006 John Costigan - -maemo-mapper is licensed under the terms of the GNU GPL. - Copyright (c) 2007 Kaj-Michael Lang - mapper is licensed under the terms of the GNU GPL. +Copyright (c) 2006 John Costigan +maemo-mapper is licensed under the terms of the GNU GPL. + By using this software you agree that you understand that using Maemo Mapper in Online Mode with a commercial map repository may be considered a violation of copyright law and that John Costigan cannot be held responsible for any of your diff --git a/debian/rules b/debian/rules index e3181b0..9f15cd7 100755 --- a/debian/rules +++ b/debian/rules @@ -33,10 +33,9 @@ configure-stamp: dh_testdir ./autogen.sh # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-static + CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --disable-static --enable-hildon --enable-device touch configure-stamp - build: build-stamp build-stamp: configure-stamp diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 40c8833..22cadc6 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -11,39 +11,36 @@ # # - Modified by jacob berkman to install # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -# -# - Modified by Rodney Dawes for use with intltool -# -# We have the following line for use by intltoolize: -# INTLTOOL_MAKEFILE GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ SHELL = /bin/sh +@SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ +top_builddir = .. VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ datadir = @datadir@ -datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = $(libdir)/locale +gnulocaledir = $(datadir)/locale +gettextsrcdir = $(datadir)/glib-2.0/gettext/po subdir = po install_sh = @install_sh@ -# Automake >= 1.8 provides @mkdir_p@. -# Until it can be supposed, use the safe fallback: -mkdir_p = $(install_sh) -d +mkdir_p = @mkdir_p@ +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +CC = @CC@ +GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ @@ -52,30 +49,35 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot -ALL_LINGUAS = @ALL_LINGUAS@ - -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) +INCLUDES = -I.. -I$(top_srcdir)/intl -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) - -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS +SOURCES = +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +DISTFILES = ChangeLog Makefile.in.in POTFILES.in \ +$(POFILES) $(GMOFILES) $(SOURCES) POTFILES = \ -# This comment gets stripped out -CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +INSTOBJEXT = @INSTOBJEXT@ .SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat +.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + +.c.o: + $(COMPILE) $< .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $< $(top_builddir)/po/$(GETTEXT_PACKAGE).pot -o $*pox .po.mo: $(MSGFMT) -o $@ $< @@ -86,7 +88,7 @@ CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$l .po.cat: sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg + && rm -f $@ && $(GENCAT) $@ $*.msg all: all-@USE_NLS@ @@ -97,91 +99,115 @@ all-no: $(GETTEXT_PACKAGE).pot: $(POTFILES) $(GENPOT) -install: install-data +install: install-exec install-data +install-exec: install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(itlocaledir) - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ + if test -n "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ + *.gmo) destdir=$(gnulocaledir);; \ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ + if test -n "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $$dir; \ else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ - "$$dir/$(GETTEXT_PACKAGE).mo"; \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ - $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as" \ - "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ + $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ else \ true; \ fi; \ fi; \ done - -# Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: + if test "$(PACKAGE)" = "glib"; then \ + if test -n "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi # Define this as empty until I found a useful application. installcheck: uninstall: - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ done - -check: all $(GETTEXT_PACKAGE).pot - rm -f missing notexist - srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m - if [ -r missing -o -r notexist ]; then \ - exit 1; \ + if test "$(PACKAGE)" = "glib"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ fi +check: all + +dvi info tags TAGS ID: + mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp + rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp + rm -fr *.o rm -f .intltool-merge-cache clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES stamp-it - rm -f *.mo *.msg *.cat *.cat.m *.gmo + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f Makefile.in.in + rm -f $(GMOFILES) -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: $(DISTFILES) +distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) +dist distdir: $(DISTFILES) $(GETTEXT_PACKAGE).pot dists="$(DISTFILES)"; \ - extra_dists="$(EXTRA_DISTFILES)"; \ - for file in $$extra_dists; do \ - test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ - done; \ for file in $$dists; do \ - test -f $$file || file="$(srcdir)/$$file"; \ - ln $$file $(distdir) 2> /dev/null \ - || cp -p $$file $(distdir); \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ done update-po: Makefile $(MAKE) $(GETTEXT_PACKAGE).pot tmpdir=`pwd`; \ - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ echo "$$lang:"; \ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ if $$result; then \ @@ -197,20 +223,32 @@ update-po: Makefile fi; \ fi; \ else \ - echo "msgmerge for $$lang.gmo failed!"; \ + echo "msgmerge for $$cat failed!"; \ rm -f $$tmpdir/$$lang.new.po; \ fi; \ done -Makefile POTFILES: stamp-it - @if test ! -f $@; then \ - rm -f stamp-it; \ - $(MAKE) stamp-it; \ - fi - -stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ +# POTFILES is created from POTFILES.in by stripping comments, empty lines +# and Intltool tags (enclosed in square brackets), and appending a full +# relative path to them +POTFILES: POTFILES.in + ( if test 'x$(srcdir)' != 'x.'; then \ + posrcprefix='$(top_srcdir)/'; \ + else \ + posrcprefix="../"; \ + fi; \ + rm -f $@-t $@ \ + && (sed -e '/^#/d' \ + -e "s/^\[.*\] +//" \ + -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) + +Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status # Tell versions [3.59,3.63) of GNU make not to export all variables. diff --git a/src/Makefile.am b/src/Makefile.am index 9c1e3fb..2298e84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,11 +20,11 @@ bin_PROGRAMS = mapper osm2db -mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(OSSO_CFLAGS) $(HILDON_CFLAGS) \ +mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(OSSO_CFLAGS) $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) \ $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) $(LIBXML2_CFLAGS) $(GSTREAMER_CFLAGS) \ $(SQLITE_CFLAGS) $(LIBCURL_CFLAGS) $(DBUS_GLIB_CFLAGS) $(BLUEZ_CFLAGS) -mapper_LDADD = $(GLIBGTK_LIBS) $(OSSO_LIBS) $(HILDON_LIBS) \ +mapper_LDADD = $(GLIBGTK_LIBS) $(OSSO_LIBS) $(HILDON_LIBS) $(HILDONFM_LIBS) \ $(GNOME_VFS_LIBS) $(GCONF_LIBS) $(LIBXML2_LIBS) $(GSTREAMER_LIBS) \ $(SQLITE_LIBS) $(LIBCURL_LIBS) $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS) -lm diff --git a/src/gps-conn.c b/src/gps-conn.c index 300eec0..1157a22 100644 --- a/src/gps-conn.c +++ b/src/gps-conn.c @@ -12,17 +12,14 @@ #include #include #include +#include +#include -#ifdef WITH_HILDON -#include -#endif +#include "hildon-mapper.h" static GtkWidget *connect_banner = NULL; static GtkWidget *fix_banner = NULL; -#include -#include - #include "utils.h" #include "settings.h" #include "gps.h" diff --git a/src/hildon-mapper.h b/src/hildon-mapper.h index bc47edd..ddc11ba 100644 --- a/src/hildon-mapper.h +++ b/src/hildon-mapper.h @@ -10,6 +10,7 @@ #include #include #include "maemo-osso.h" +#include "iap.h" #endif #ifdef WITH_HILDON @@ -22,6 +23,9 @@ #include #include #include +#ifdef WITH_HILDONFM +#include +#endif #else #include #include @@ -30,10 +34,9 @@ #include #include #include +#ifdef WITH_HILDONFM +#include #endif - -#ifdef WITH_HILDON_FM -#include #endif #ifdef WITH_DEVICE_770 diff --git a/src/hildon-wrappers.c b/src/hildon-wrappers.c index a8f524c..a73d9b1 100644 --- a/src/hildon-wrappers.c +++ b/src/hildon-wrappers.c @@ -8,7 +8,7 @@ #include #include "ui-common.h" -#ifndef WITH_HILDON_FM +#ifndef WITH_HILDONFM GtkWidget *hildon_file_chooser_dialog_new(GtkWindow * parent, GtkFileChooserAction action) diff --git a/src/ui-common.c b/src/ui-common.c index 8091f5a..a6c94e6 100644 --- a/src/ui-common.c +++ b/src/ui-common.c @@ -667,6 +667,10 @@ item = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); g_signal_connect (item, "clicked", G_CALLBACK (cb_add_poi), NULL); gtk_toolbar_insert (GTK_TOOLBAR (_toolbar), item, -1); +#ifndef GTK_STOCK_INFO +#define GTK_STOCK_INFO GTK_STOCK_PROPERTIES +#endif + item = gtk_tool_button_new_from_stock (GTK_STOCK_INFO); g_signal_connect (item, "clicked", G_CALLBACK (menu_cb_gps_details), NULL); gtk_toolbar_insert (GTK_TOOLBAR (_toolbar), item, -1); diff --git a/src/ui-maemo.h b/src/ui-maemo.h index 7f9a3e5..1882704 100644 --- a/src/ui-maemo.h +++ b/src/ui-maemo.h @@ -1,7 +1,9 @@ #ifndef _MAPPER_UI_MAEMO_H #define _MAPPER_UI_MAEMO_H -#include +#include "config.h" + +#include "hildon-mapper.h" #ifdef WITH_HILDON @@ -21,10 +23,8 @@ osso_context_t *_osso; #endif -#include /** The main GtkWindow of the application. */ HildonProgram *_program; #endif - #endif