Merge pull request #62 from navit-gps/trac/1341

Removing autotools support, merged following the conversion of the Navit tomtom and Opentom builds and the lack of other comments for almost eight moths. 

81 files changed, 0 insertions, 3441 deletions

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 7bc7d34d3..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-ACLOCAL_AMFLAGS= -I m4
-include $(top_srcdir)/Makefile.inc
-SUBDIRS=
-if USE_NATIVE_LANGUAGE_SUPPORT
-XCFLAGS=-DINSTALLPREFIX=INSTALLDIR
-if SUPPORT_WIN32
-XCFLAGS+=-DSUBLANG_BENGALI_BANGLADESH=0x03 -DSUBLANG_PUNJABI_PAKISTAN=0x03 -DSUBLANG_ROMANIAN_MOLDOVA=0x03
-if SUPPORT_WIN32CE
-if SHARED_LIBNAVIT
-XCFLAGS+=-L../navit/support/libc -lsupport_libc
-AM_MAKEFLAGS=l=l
-SUBDIRS+=navit/support/libc
-endif
-endif
-endif
-if SUPPORT_ANDROID
-XCFLAGS+=-Xcompiler -nostartfiles
-endif
-export XCFLAGS
-SUBDIRS+=intl po man
-endif
-SUBDIRS+=navit
-pkgdoc_DATA = README
-EXTRA_DIST = README COPYRIGHT LGPL-2 GPL-2 COPYING INSTALL contrib/android_build.sh contrib/sjjb_import.pl
-DIST_SUBDIRS=intl po navit man
diff --git a/Makefile.inc b/Makefile.inc
deleted file mode 100644
index 22fd8023e..000000000
--- a/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-modulebindingdir=$(pkglibdir)/binding
-modulemapdir=$(pkglibdir)/map
-modulefontdir=$(pkglibdir)/font
-modulegraphicsdir=$(pkglibdir)/graphics
-moduleguidir=$(pkglibdir)/gui
-modulespeechdir=$(pkglibdir)/speech
-moduleosddir=$(pkglibdir)/osd
-modulevehicledir=$(pkglibdir)/vehicle
-moduleplugindir=$(pkglibdir)/plugin
-moduleautoloaddir=$(pkglibdir)/autoload
-pkgdocdir=$(pkgdatadir)
-imagedir=$(pkgdatadir)/xpm
-skinsdir=$(pkgdatadir)/skins
-fontsdir=$(pkgdatadir)/fonts
-mapsdir=$(pkgdatadir)/maps
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 9638fd9ee..000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-if [ `uname` = Darwin ]; then
-	LIBTOOL=glibtool
-else
-	LIBTOOL=libtool
-fi
-
-for pkg in pkg-config $LIBTOOL automake aclocal autoreconf:autoconf autopoint:gettext
-do
-	if ! ${pkg%%:*} --version >/dev/null 
-	then
-		echo "You need to install ${pkg##*:}"
-		exit 1
-	fi
-done
-
-autoreconf --install -I m4 "$@"
-echo "***** WARNING *****"
-echo "Support for autotools will be removed soon from navit, please use cmake instead"
-sleep 5
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 67eca74c1..000000000
--- a/configure.in
+++ /dev/null
@@ -1,1336 +0,0 @@
-AC_INIT(navit, 0.5.0)
-AC_CONFIG_MACRO_DIR([m4])
-SOURCE_MODE=svn
-
-AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
-
-AC_SUBST(SOURCE_MODE)
-AM_CONDITIONAL(SOURCE_MODE_SVN, [test "x${SOURCE_MODE}" = "xsvn"])
-
-if test "x${SOURCE_MODE}" = "xsvn" ; then
-	USE_MAINTAINER_MODE=yes
-else
-	USE_MAINTAINER_MODE=no
-fi
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is enabled by default (reason of inclusion of this function)
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval)
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-AM_MAINTAINER_MODE
-
-
-plugins=yes; plugins_reason=default
-postgresql=yes; postgresql_reason=default
-samplemap=yes; samplemap_reason=default
-binding_dbus=yes; binding_dbus_reason=default
-binding_dbus_use_system_bus=no
-binding_python=yes; binding_python_reason=default
-binding_win32=no; binding_win32_reason=default
-font_freetype=yes; font_freetype_reason=default
-fontconfig=yes; fontconfig_reason=default
-fribidi=yes; fribidi_reason=default
-gui_gtk=no; gui_gtk_reason=default
-gui_win32=no; gui_win32_reason=default
-gui_internal=yes; gui_internal_reason=default
-gui_qml=no; gui_qml_reason=default
-graphics=yes; graphics_reason=default
-graphics_gd=no; graphics_gd_reason=default
-graphics_gtk_drawing_area=no; graphics_gtk_drawing_area_reason=default
-graphics_qt_qpainter=yes; graphics_qt_qpainter_reason=default
-graphics_null=yes; graphics_null_reason=default
-graphics_opengl=yes; graphics_opengl_reason=default
-graphics_sdl=yes; graphics_sdl_reason=default
-graphics_win32=no; graphics_win32_reason=default
-maptool=yes; maptool_reason=default
-map_binfile=yes; map_binfile_reason=default
-map_filter=yes; map_filter_reason=default
-map_mg=yes; map_mg_reason=default
-map_shapefile=yes; map_shapefile_reason=default
-map_textfile=yes; map_textfile_reason=default
-map_csv=yes; map_csv_reason=default
-osd_core=yes; osd_core_reason=default
-plugin_pedestrian=no; plugin_pedestrian_reason=default
-routing=yes; routing_reason=default
-speech_android=no; speech_android_reason=default
-speech_cmdline=yes; speech_cmdline_reason=default
-speech_dbus=no; speech_dbus_reason=default
-speech_espeak=no; speech_espeak_reason=default
-speech_speech_dispatcher=yes; speech_speech_dispatcher_reason=default
-vehicle_demo=yes; vehicle_demo_reason=default
-vehicle_file=yes; vehicle_file_reason=default
-vehicle_gpsd=yes; vehicle_gpsd_reason=default
-vehicle_gpsd_dbus=no; vehicle_gpsd_dbus_reason=default
-vehicle_gypsy=yes; vehicle_gypsy_reason=default
-vehicle_null=no; vehicle_null_reason=default
-vehicle_wince=no; vehicle_wince_reason=default
-vehicle_iphone=no; vehicle_iphone_reason=default
-vehicle_android=no; vehicle_android_reason=default
-graphics_android=no; graphics_android_reason=default
-vehicle_maemo=no; vehicle_maemo_reason=default
-vehicle_webos=no; vehicle_webos_reason=default
-
-shared_libnavit=no
-LIBNAVIT=navit
-bin_navit=yes
-
-AC_CANONICAL_HOST
-win32=no
-win32ce=no
-case $host_os in
-wince|mingw32ce|cegcc)
-	win32=yes
-	win32ce=yes
-	AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
-	AC_DEFINE(HAVE_API_WIN32_CE, 1, [Have Windows CE API])
-	AC_DEFINE(HAVE_PRAGMA_PACK, 1, [Have pragma pack])
-	binding_win32=yes; binding_win32_reason="host_os is wince"
-	gui_win32=yes; gui_win32_reason="host_os is wince"
-	graphics_win32=yes; graphics_win32_reason="host_os is wince"
-	vehicle_wince=yes; vehcile_wince_reason="host_os is wince"
-	speech_espeak=yes; speech_espeak_reason="host_os is wince"
-	support_libpng=yes
-        maptool=no; maptool_reason="host_os is wince"
-	;;
-mingw32)
-	win32=yes
-	AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
-	AC_DEFINE(HAVE_API_WIN32, 1, [Have Windows API])
-	binding_win32=yes; binding_win32_reason="host_os is mingw32"
-	gui_win32=yes; gui_win32_reason="host_os is mingw32"
-	graphics_win32=yes; graphics_win32_reason="host_os is mingw32"
-	speech_espeak=yes; speech_espeak_reason="host_os is mingw32"
-	support_libpng=yes
-	;;
-linux*_android)
-	android=yes
-	shared_libnavit=yes
-	bin_navit=no
-	AC_DEFINE(HAVE_API_ANDROID, 1, [Have Android API])
-	echo "void dl_unwind_find_exidx(void) {}" >crt0.c
-	$CC -c crt0.c
-	$AR r libg.a crt0.o
-	vehicle_android=yes; vehicle_android_reason="host_os is android"
-	graphics_android=yes; graphics_android_reason="host_os is android"
-	speech_android=yes; speech_android_reason="host_os is android"
-	MODULE_LDFLAGS="-module -Xcompiler -nostdlib -Xcompiler -Wl,-rpath -Xcompiler -Wl,/data/data/org.navitproject.navit/lib"
-	MODULE_LIBADD="-llog"
-	LIBNAVIT=_data_data_org.navitproject.navit_lib_navit
-	NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS -L\$(top_builddir)/navit -l$LIBNAVIT"
-	;;
-esac
-if test "x$win32" = "xyes"
-then
-	NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/win32"
-	NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/win32 -lsupport_win32"
-	NAVIT_SOCKET_LDFLAGS="$MODULE_LDFLAGS -lws2_32"
-fi
-
-
-AM_CONDITIONAL(SUPPORT_WIN32, [test "x$win32" = "xyes"])
-AM_CONDITIONAL(SUPPORT_WIN32CE, [test "x$win32ce" = "xyes"])
-AM_CONDITIONAL(SUPPORT_ANDROID, [test "x$android" = "xyes"])
-
-if test "x$support_libpng" = "xyes"
-then
-	NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/libpng"
-	NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/libpng -lsupport_libpng"
-fi
-AM_CONDITIONAL(SUPPORT_LIBPNG, [test "x$support_libpng" = "xyes"])
-
-AC_SUBST(MODULE_LDFLAGS)
-AC_SUBST(MODULE_LIBADD)
-AC_SUBST(NAVIT_MODULE_LDFLAGS)
-AC_SUBST(NAVIT_SOCKET_LDFLAGS)
-
-LIBS="$LIBS -lm"
-if test "$win32" == "no" -a test "$host_os" != "cygwin"; then
-	LIBS="$LIBS -rdynamic"
-fi
-
-m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],
-	[AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE])])
-
-AC_USE_SYSTEM_EXTENSIONS
-
-m4_ifdef([AC_PROG_OBJC],[AC_PROG_OBJC])
-AC_PROG_CC
-m4_ifdef([AC_PROG_OBJC],[AC_PROG_OBJC],[AC_SUBST([OBJC],["$CC"])
-AC_SUBST([OBJCFLAGS],["$CFLAGS"])])
-m4_ifndef([AC_PROG_OBJC],[_AM_DEPENDENCIES(OBJC)])
-
-if eval "test x`uname` = xDarwin"; then
-	CFLAGS="$CFLAGS -I/opt/local/include -L/opt/local/lib"
-fi
-if eval "test x$GCC = xyes"; then
-        CFLAGS="$CFLAGS -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type -D_GNU_SOURCE"
-fi
-AM_PROG_CC_C_O
-
-AC_PROG_CXX
-if eval "test x$GXX = xyes"; then
-        CXXFLAGS="$CXXFLAGS -Wall -Wcast-align -Wpointer-arith -Wreturn-type -D_GNU_SOURCE"
-fi
-
-PKG_CHECK_EXISTS
-if test "x${cross_compiling}" = "xyes"; then
-	samplemap="no";samplemap_reason="not supported for cross compiling"
-	binding_python="no";binding_python_reason="not supported for cross compiling"
-	postgresql="no";postgresql_reason="not supported for cross compiling"
-	AC_MSG_CHECKING([for a C compiler for build tools])
-	AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
-else
-	CC_FOR_BUILD=$CC
-fi
-CCLD_FOR_BUILD="$CC_FOR_BUILD"
-AC_SUBST(cross_compiling)
-AM_CONDITIONAL(CROSS_COMPILING, test "x${cross_compiling}" = "xyes")
-AC_SUBST(CC_FOR_BUILD)
-AC_SUBST(CCLD_FOR_BUILD)
-
-# Endianness
-# defines WORDS_BIGENDIAN for big-endian systems
-AC_C_BIGENDIAN
-
-AC_ARG_ENABLE(variant, [  --enable-variant=something          set variant], NAVIT_VARIANT=$enableval)
-AC_SUBST(NAVIT_VARIANT)
-
-AC_ARG_ENABLE(cache-size, [  --enable-cache-size=size in bytes        set cache size], AC_DEFINE_UNQUOTED(CACHE_SIZE,[${enableval}], [Size of Cache in Bytes]),AC_DEFINE(CACHE_SIZE,[1048576], [Size of Cache in Bytes]))
-
-AC_ARG_ENABLE(avoid-unaligned, [  --enable-avoid-unaligned          avoid unaligned accesses], AVOID_UNALIGNED=$enableval, AVOID_UNALIGNED=no)
-test x"${AVOID_UNALIGNED}" = xyes && AC_DEFINE(AVOID_UNALIGNED,[],Define to avoid unaligned access)
-
-AC_ARG_ENABLE(avoid-float, [  --enable-avoid-float              avoid floating point calculations], AVOID_FLOAT=$enableval, AVOID_FLOAT=no)
-test x"${AVOID_FLOAT}" = xyes && AC_DEFINE(AVOID_FLOAT,[],Define to avoid floating point)
-
-AC_ARG_ENABLE(transformation-roll, [  --enable-transformation-roll      add support for specifying roll angle in transformation], ENABLE_ROLL=$enableval, ENABLE_ROLL=no)
-test x"${ENABLE_ROLL}" = xyes && AC_DEFINE(ENABLE_ROLL,[],Define to add support for specifying roll angle in transformation)
-
-AC_ARG_ENABLE(hildon, [  --disable-hildon              build without maemo/hildon support], enable_hildon=$enableval, enable_hildon=yes)
-if test "x${enable_hildon}" = "xyes" ; then
-	PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.9.9, , [
-		AC_MSG_RESULT(no)
-		enable_hildon=no
-	])
-	PKG_CHECK_MODULES(GPSBT, gpsbt, [
-		AC_DEFINE(HAVE_GPSBT, 1, [Have the gpsbt library])
-		AC_SUBST(GPSBT_CFLAGS)
-		AC_SUBST(GPSBT_LIBS)
-		], [
-		AC_MSG_RESULT(no)
-	])
-	if test x"${enable_hildon}" = xyes ; then
-		AC_DEFINE(USE_HILDON, 1, [Build with maemo/hildon support])
-		AC_SUBST(HILDON_CFLAGS)
-		AC_SUBST(HILDON_LIBS)
-	fi
-fi
-AM_CONDITIONAL(USE_HILDON, test "${enable_hildon}" = "xyes")
-
-AC_ARG_ENABLE(osso, [  --disable-osso              build without maemo/osso support], enable_osso=$enableval, enable_osso=yes)
-if test "x${enable_osso}" = "xyes" ; then
-	PKG_CHECK_MODULES(LIBOSSO, libosso, , [
-		AC_MSG_RESULT(no)
-		enable_osso=no
-	])
-	if test x"${enable_osso}" = xyes ; then
-		AC_DEFINE(USE_OSSO, 1, [Build with maemo/osso support])
-		AC_SUBST(LIBOSSO_CFLAGS)
-		AC_SUBST(LIBOSSO_LIBS)
-	fi
-fi
-echo ${enable_osso}
-AM_CONDITIONAL(USE_OSSO, test "x${enable_osso}" = "xyes")
-
-AC_ARG_ENABLE(garmin, [  --disable-garmin             disable garmin support], USE_GARMIN=$enableval, USE_GARMIN=yes)
-
-# samplemap
-AC_PATH_PROG(_PATH_BZCAT,[bzcat])
-if test "x${_PATH_BZCAT}" = "x" ; then
-	samplemap=no; samplemap_reason="bzcat missing"
-fi
-AC_ARG_ENABLE(maptool, [  --disable-maptool             don't build maptool], maptool=$enableval;maptool_reason="configure parameter")
-AM_CONDITIONAL(MAPTOOL, [test "x$maptool" = "xyes"])
-if test "x$maptool" != "xyes"; then
- 	samplemap=no; samplemap_reason="maptool disabled"
-fi
-AC_ARG_ENABLE(samplemap, [  --disable-samplemap             don't build the samplemap], samplemap=$enableval;samplemap_reason="configure parameter")
-AM_CONDITIONAL(BUILD_SAMPLEMAP, [test "x$samplemap" = "xyes"])
-
-AC_ARG_ENABLE(fastmath, [  --disable-fastmath             don't build with fastmath], fastmath=$enableval, fastmath=yes)
-AM_CONDITIONAL(FASTMATH, [test "x$fastmath" = "xyes"])
-
-if test x"$fastmath" = xyes; then
-	if eval "test x$GCC = xyes"; then
-		CFLAGS="$CFLAGS -ffast-math"
-	fi
-fi
-
-X_CFLAGS="-I$x_includes"
-AS_IF([test -n "$ac_x_libraries"], [X_LIBS="-L$ac_x_libraries"])
-
-# glib
-AC_ARG_ENABLE(glib, [  --disable-glib             don't build with external glib], glib=$enableval, glib=yes)
-if test "x${glib}" = "xyes" -a "x${GLIB_CFLAGS}" = "x" -a "x${GLIB_LIBS}" = "x"; then
-	PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0], [glib=yes],[glib=no])
-fi
-if test "x${glib}" = "xyes"; then
-	AC_DEFINE(HAVE_GLIB, 1, [Define to 1 if you have (external) glib library])
-else
-	GLIB_CFLAGS="-I\$(top_srcdir)/navit/support -I\$(top_srcdir)/navit/support/glib -I\$(top_srcdir)/navit/support/ezxml"
-	GLIB_LIBS="-L\$(top_builddir)/navit/support/glib -lsupport_glib -L\$(top_builddir)/navit/support/ezxml -lsupport_ezxml"
-	if test "x${win32}" != "xyes" -a "x${android}" != "xyes"; then
-		GLIB_LIBS="$GLIB_LIBS -lpthread"
-	fi
-fi
-
-# gmodule
-AC_ARG_ENABLE(gmodule, [  --disable-gmodule             don't build with gmodule], gmodule=$enableval, gmodule=yes)
-if test x"${gmodule}" = "xyes"; then
-	PKG_CHECK_MODULES(GMODULE, [gmodule-2.0], [gmodule=yes], [gmodule=no])
-fi
-if test "x${gmodule}" = "xyes"; then
-	AC_DEFINE(HAVE_GMODULE, 1, [Define to 1 if you have gmodule])
-else
-	AC_CHECK_LIB(dl, dlopen,
-		[plugins_reason="default, via dlopen";GMODULE_LIBS="-ldl";AC_DEFINE(HAVE_DLOPEN, 1, [Define to 1 if you have dlopen])], 	 
-		[plugins="no"; plugins_reason="package gmodule and dlopen missing"]
-	)
-fi
-
-# libcrypto
-AC_CHECK_LIB(crypto, AES_encrypt, [CRYPTO_LIBS="-lcrypto";AC_DEFINE(HAVE_LIBCRYPTO, 1, [Define to 1 if you have libcrypto])]) 	 
-AC_SUBST(CRYPTO_LIBS)
-
-# plugins
-AC_ARG_ENABLE(plugins, 	[  --disable-plugins          disable plugins], [ plugins=$enableval;plugin_reason="configure parameter" ])
-AC_ARG_ENABLE(shared-libnavit, 	[  --enable-shared-libnavit], [ shared_libnavit=$enableval])
-if test "x${plugins}" = "xyes"; then
-	AC_ENABLE_SHARED
-	AC_DISABLE_STATIC
-	AC_DEFINE(
-		[USE_PLUGINS],
-		[],
-		Define to 1 if you have plugins.
-	)
-	if test "x${win32}" = "xyes"; then
-		shared_libnavit=yes
-		NAVIT_MODULE_LDFLAGS="-no-undefined -L\$(top_builddir)/navit -l$LIBNAVIT -L\$(top_builddir)/intl -lintl"
-	fi
-else
-	if test "x${shared_libnavit}" = "xyes"; then
-		AC_ENABLE_SHARED
-		AC_DISABLE_STATIC
-	else
-		AC_DISABLE_SHARED
-		AC_ENABLE_STATIC
-	fi
-fi
-AM_CONDITIONAL(PLUGINS, [test "x$plugins" = "xyes"])
-AM_CONDITIONAL(SHARED_LIBNAVIT, [test "x$shared_libnavit" = "xyes"])
-AM_CONDITIONAL(BIN_NAVIT, [test "x$bin_navit" = "xyes"])
-AC_PROG_LIBTOOL
-AC_SUBST(LIBNAVIT)
-
-AM_CONDITIONAL(EVENT_GLIB, [test "x$glib" = "xyes"])
-AM_CONDITIONAL(SUPPORT_GLIB, [test "x$glib" = "xno"])
-AM_CONDITIONAL(SUPPORT_EZXML, [test "x$glib" = "xno"])
-
-AC_CHECK_HEADER([sys/time.h],
-		 [AC_DEFINE(
-			[HAVE_SYS_TIME_H],
-			[1],
-			[Define to 1 if you have the <sys/time.h> header file.])
-		])
-
-if test "x${ZLIB_CFLAGS}" = "x" -a "x${ZLIB_LIBS}" = "x"; then
-AC_CHECK_HEADER(
-	zlib.h,
-	AC_DEFINE(
-		[HAVE_ZLIB],
-		[],
-		Define to 1 if you have the <zlib.h> header file.
-	)
-	ZLIB_LIBS="-lz"
-	zlib=yes,
-	ZLIB_CFLAGS="-I\$(top_srcdir)/navit/support/zlib"
-	ZLIB_LIBS="-L\$(top_builddir)/navit/support/zlib -lsupport_zlib"
-	zlib=no
-)
-else
-	zlib=yes
-fi
-AM_CONDITIONAL(SUPPORT_ZLIB, [test "x$zlib" = "xno"])
-AC_SUBST(ZLIB_CFLAGS)
-AC_SUBST(ZLIB_LIBS)
-
-AC_CHECK_HEADER(sys/socket.h, AC_DEFINE([HAVE_SOCKET],[],Define to 1 if you have sockets))
-AC_CHECK_HEADER(winsock2.h, AC_DEFINE([HAVE_WINSOCK],[],Define to 1 if you have Windows sockets))
-
-# gtk
-PKG_CHECK_MODULES(GTK2, [gtk+-2.0], [gtk2_pkgconfig=yes], [gtk2_pkgconfig=no])
-if test "x$gtk2_pkgconfig" = "xyes"; then
-	AC_DEFINE(HAVE_GTK2, 1, [Define to 1 if you have gtk2])
-	graphics_gtk_drawing_area=yes; graphics_gtk_drawing_area_reason="gtk+-2.0 present"
-	gui_gtk=yes; gui_gtk_reason="gtk+-2.0 present"
-fi
-
-# fsync
-AC_MSG_CHECKING(for fsync)
-AC_TRY_LINK([#include <unistd.h>], [fsync(0);],AC_MSG_RESULT(yes);AC_DEFINE(HAVE_FSYNC, 1, [Define to 1 if you have the `fsync' function.]),AC_MSG_RESULT(no))
-
-# system
-AC_MSG_CHECKING(for system)
-AC_TRY_LINK([#include <stdlib.h>], [system("/bin/true");],AC_MSG_RESULT(yes);AC_DEFINE(HAVE_SYSTEM, 1, [Define to 1 if you have the `system' function.]),speech_cmdline=no; speech_cmdline_reason="not supported without system()"; AC_MSG_RESULT(no))
-
-AC_MSG_CHECKING(for CreateProcess)
-AC_TRY_LINK([#include <windows.h>], [CreateProcess(NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL);],AC_MSG_RESULT(yes);AC_DEFINE(HAVE_CREATEPROCESS, 1, [Define to 1 if you have the `CreateProcess' function.]) speech_cmdline=yes; speech_cmdline_reason="CreateProcess exists", AC_MSG_RESULT(no))
-
-# sbrk
-AC_MSG_CHECKING(for sbrk)
-AC_TRY_LINK([#include <unistd.h>], [sbrk(0);],AC_MSG_RESULT(yes);AC_DEFINE(HAVE_SBRK, 1, [Define to 1 if you have the `sbrk' function.]),AC_MSG_RESULT(no))
-
-
-AC_ARG_ENABLE(graphics-sdl, [  --disable-graphics-sdl             don't create graphics sdl], graphics_sdl=$enableval;graphics_sdl_reason="configure parameter")
-
-if test "x${graphics_sdl}" = "xyes" ; then
-        PKG_CHECK_MODULES(SDL, 
-                          [sdl], 
-                          [graphics_sdl="yes"
-                           graphics_sdl_reason="sdl present"] , 
-                          [graphics_sdl="no"
-                           graphics_sdl_reason="sdl not available"]
-                         )
-        AC_SUBST(SDL_CFLAGS)
-        AC_SUBST(SDL_LIBS)
-fi
-if test "x${graphics_sdl}" = "xyes" ; then
-	save_CPPFLAGS=$CPPFLAGS
-	CPPFLAGS="$SDL_CFLAGS $CPPFLAGS"
-	AC_CHECK_HEADER(SDL_image.h,SDL_IMAGE_LIBS=-lSDL_image,graphics_sdl="no";graphics_sdl_reason="SDL_image.h missing")
-	AC_SUBST(SDL_IMAGE_LIBS)
-	CPPFLAGS=$save_CPPFLAGS
-fi
-if test "x${graphics_sdl}" = "xyes" ; then
-	AC_DEFINE(GRAPHICS_SDL, 1, [Build with graphics sdl])
-fi
-AM_CONDITIONAL(GRAPHICS_SDL, test "x${graphics_sdl}" = "xyes")
-
-AC_ARG_ENABLE(postgresql, [  --disable-postgresql             don't add postgresql support to maptool], postgresql=$enableval;postgresql_reason="configure parameter")
-if test "x${postgresql}" = "xyes" ; then
-	if test -z "$PG_CONFIG"; then
-            AC_PATH_PROG([PG_CONFIG], [pg_config], [])
-        fi
-        AC_MSG_CHECKING([for PostgreSQL libraries with $PG_CONFIG])
-	if test ! -x "$PG_CONFIG"; then
-	    if test "x${PG_CONFIG}" = "x" ; then
-	    	 postgresql_reason="$PG_CONFIG not executable"
-	    else
-	    	 postgresql_reason="pg_config missing"
-            fi
-	    postgresql=no 
-            AC_MSG_RESULT([no])
-	else
-	    POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
-	    POSTGRESQL_LIBS="-L`$PG_CONFIG --libdir` -lpq"
-    	    AC_DEFINE(HAVE_POSTGRESQL, 1, [Postgresql libraries available])
-	    AC_SUBST(POSTGRESQL_CFLAGS)
-	    AC_SUBST(POSTGRESQL_LIBS)
-            AC_MSG_RESULT([yes])
-       	fi 
-fi
-AM_CONDITIONAL(HAVE_POSTGRESQL, test "x${postgresql}" = "xyes")
-# font
-# freetype
-AC_ARG_ENABLE(font-freetype, [  --disable-font-freetype             don't add freetype support], font_freetype=$enableval;font_freetype_reason="configure parameter")
-if test "x${font_freetype}" = "xyes" -a "x${FREETYPE2_CFLAGS}" = "x" -a "x${FREETYPE2_LIBS}" = "x"; then
-	PKG_CHECK_MODULES(FREETYPE2, [freetype2], , [font_freetype=no;font_freetype_reason="Package freetype2 missing"])	
-else
-	fribidi=no
-fi
-AC_SUBST(FREETYPE2_CFLAGS)
-AC_SUBST(FREETYPE2_LIBS)
-AM_CONDITIONAL(FONT_FREETYPE, test "x${font_freetype}" = "xyes")
-AC_ARG_WITH(freetype-fonts, [ --with-freetype-fonts   specify what fonts to use], AC_DEFINE_UNQUOTED(FREETYPE_FONTS,[${withval}],[Freetype fonts to use]))
-
-AC_ARG_ENABLE(fontconfig, [  --disable-fontconfig             don't' add fontconfig support], fontconfig=$enableval;fontconfig_reason="configure parameter")
-if test "x${fontconfig}" = "xyes"; then
-	PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], [fontconfig=yes], [fontconfig=no])
-fi
-if test "x$fontconfig" = "xyes"; then
-   AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if you have fontconfig])
-fi
-AC_SUBST(FONTCONFIG_CFLAGS)
-AC_SUBST(FONTCONFIG_LIBS)
-
-AM_CONDITIONAL(FONTS, test "x${font_freetype}" = "xyes" -a "x$fontconfig" != "xyes")
-
-# fribidi 
-AC_ARG_ENABLE(fribidi, [  --disable-fribidi      dont build with fribidi], fribidi=$enableval;fribidi_reason="configure parameter", fribidi=yes)
-if test x"${fribidi}" = "xyes"; then
-	PKG_CHECK_MODULES(FRIBIDI2,  [fribidi >= 0.19.0], [fribidi=yes;oldfribidi=no],
-                        [ PKG_CHECK_MODULES([FRIBIDI], [fribidi],
-                          [fribidi=yes;oldfribidi=yes;fribid_reason="using old version"], [fribidi=no;fribidi_reason="FriBidi library not found"])
-                        ])
-fi
-if test x"${fribidi}" = "xyes"; then
-	AC_DEFINE(USE_FRIBIDI, 1, [Build with fribidi support])
-fi
-if test x"${oldfribidi}" = "xyes"; then
-	AC_DEFINE(FRIBIDIOLD, 1, [Build with fribidi support for older versions of fribidi])
-fi
-
-AC_SUBST(FRIBIDI2_CFLAGS)
-AC_SUBST(FRIBIDI2_LIBS)
-AC_SUBST(FRIBIDI_CFLAGS)
-AC_SUBST(FRIBIDI_LIBS)
-
-PKG_CHECK_MODULES(IMLIB2, [imlib2], [imlib2_pkgconfig=yes], [imlib2_pkgconfig=no])
-if test "x$imlib2_pkgconfig" = "xyes"; then
-   AC_DEFINE(HAVE_IMLIB2, 1, [Define to 1 if you have imlib2])
-fi
-AC_SUBST(IMLIB2_CFLAGS)
-AC_SUBST(IMLIB2_LIBS)
-
-AC_ARG_ENABLE(graphics-opengl, [  --disable-graphics-opengl      disable graphics type OpenGL], graphics_opengl=$enableval;graphics_opengl_reason="configure parameter")
-if test "x${graphics_opengl}" = "xyes" ; then
-
-AC_CHECK_HEADER(
-	GL/gl.h,
-	AC_DEFINE(
-		[HAVE_OPENGL],
-		[],
-		Define to 1 if you have the <GL/gl.h> header file.
-		)
-		OPENGL_LIBS="$X_LIBS -lGL -lglut -lfreeimage"
-		opengl=yes,
-	AC_MSG_WARN([*** no GL/gl.h -- opengl graphics support disabled];graphics_opengl=no;graphics_opengl_reason="GL/gl.h header missing")
-)
-
-AC_CHECK_HEADER(
-	GL/glut.h,
-	AC_DEFINE(
-		[HAVE_GLUT],
-		[],
-		Define to 1 if you have the <GL/glut.h> header file.
-		)
-		glut=yes,
-	AC_MSG_WARN([*** no GL/glut.h -- opengl graphics support disabled]);graphics_opengl=no;graphics_opengl_reason="GL/glut.h header missing"
-)
-
-AC_CHECK_HEADER(
-	GL/freeglut.h,
-	AC_DEFINE(
-		[HAVE_FREEGLUT],
-		[],
-		Define to 1 if you have the <GL/freeglut.h> header file.
-		)
-		freeglut=yes,
-	AC_MSG_WARN([*** no GL/freeglut.h -- opengl support disabled]);graphics_opengl=no;graphics_opengl_reason="Headers missing"
-)
-
-AC_SUBST(OPENGL_CFLAGS)
-AC_SUBST(OPENGL_LIBS)
-
-AC_CHECK_HEADER(
-	GL/glc.h,
-	AC_DEFINE(
-		[HAVE_GLC],
-		[],
-		Define to 1 if you have the <GL/glc.h> header file.
-		)
-		GLC_LIBS="-lGLC"
-		glc=yes,
-	AC_MSG_WARN([*** no GL/glc.h -- opengl graphics support disabled]);graphics_opengl=no;graphics_opengl_reason="GL/glc.h header missing"
-)
-AC_CHECK_HEADER(
-	FreeImage.h,
-	AC_DEFINE(
-		[HAVE_FREEIMAGE],
-		[1],
-		Define to 1 if you have the <FreeImage.h> header file.
-		)
-		FREEIMAGE_LIBS="-lfreeimage"
-		freeimage=yes,
-	AC_MSG_WARN([*** no FreeImage.h -- opengl support disabled]);graphics_opengl=no;graphics_opengl_reason="Headers missing"
-)
-AC_SUBST(FREEIMAGE_LIBS)
-AC_SUBST(GLC_CFLAGS)
-AC_SUBST(GLC_LIBS)
-fi
-
-AM_CONDITIONAL(GRAPHICS_OPENGL, [test "x$glut" = "xyes" -a "x$freeglut" = "xyes" -a "x$opengl" = "xyes" -a "x$freeimage" = "xyes"  -a "x$glc" = "xyes" ])
-
-
-system_shapefile=no
-if test x"${map_shapefile}" = xyes
-then
-AC_CHECK_HEADERS(
-		[shapefil.h libshp/shapefil.h],
-		[AC_DEFINE(
-			  [HAVE_SYS_SHAPEFILELIB],
-			  [1],
-			  Define to 1 if you have the <shapefil.h> header file.
-			  )],
-		[SHAPEFILE_CFLAGS="-I\$(top_srcdir)/navit/support/shapefile"]
-		)
-
-AC_CHECK_LIB(
-		[shp],
-		[DBFDeleteField],
-		[SHAPEFILE_LIBS="-lshp"
-		 system_shapefile=yes],
-		[SHAPEFILE_LIBS="-L\$(top_builddir)/navit/support/shapefile -lsupport_shapefile"
-		 system_shapefile=no]
-	    )
-
-if test x"${system_shapefile}" = xno
-then
-	 AC_MSG_WARN([*** The shapefile library(libshp) from the system is to old or not found!  -- using included copy])
-fi
-
-fi
-AC_SUBST(SHAPEFILE_CFLAGS)
-AC_SUBST(SHAPEFILE_LIBS)
-AM_CONDITIONAL(HAVE_SYSTEM_SHAPEFILELIB, [test "x$system_shapefile" = "xyes" ])
-
-if test x"${USE_GARMIN}" = xyes
-then
-	# check for libgarmin
-	PKG_CHECK_MODULES(LIBGARMIN, libgarmin, use_libgarmin=yes, use_libgarmin=no)
-	AC_SUBST(LIBGARMIN_CFLAGS)
-	AC_SUBST(LIBGARMIN_LIBS)
-fi
-	AM_CONDITIONAL(HAVELIBGARMIN, [test "x$use_libgarmin" = "xyes"])
-
-## binding
-# python
-AC_ARG_ENABLE(binding-python, [  --disable-binding-python             don't create binding python], binding_python=$enableval;binding_python_reason="configure parameter")
-if test "x${binding_python}" = "xyes"; then
-	AC_PATH_PROG(_PATH_PYTHON,[python])
-	dnl Libraries and flags for embedded Python.
-	dnl FIXME: I wish there was a less icky way to get this.
-	if test "x${_PATH_PYTHON}" != "x" ; then
-		AC_MSG_CHECKING(for Python linkage)
-		AC_PATH_PROG([PYTHONCONFIG], [python-config], [])
-		if test "x${PYTHONCONFIG}" = "x" ; then
-			py_prefix=`$_PATH_PYTHON -c 'import sys; print sys.prefix'`
-			py_ver=`$_PATH_PYTHON -c 'import sys; print sys.version[[:3]]'`
-			py_lib=`$_PATH_PYTHON -c 'import sys; print sys.lib'`
-			py_libdir="${py_prefix}/${py_lib}/python${py_ver}"
-			PYTHON_CFLAGS="-I${py_prefix}/include/python${py_ver}"
-			if test -f $py_libdir/config/Makefile -a -f $py_prefix/include/python${py_ver}/Python.h; then
-				py_libs=`grep '^LIBS=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
-				py_libc=`grep '^LIBC=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
-				py_libm=`grep '^LIBM=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
-				py_liblocalmod=`grep '^LOCALMODLIBS=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
-				py_libbasemod=`grep '^BASEMODLIBS=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
-				PYTHON_LIBS="-L$py_libdir/config $py_libs $py_libc $py_libm -lpython$py_ver $py_liblocalmod $py_libbasemod"
-				PYTHON_LIBS=`echo $PYTHON_LIBS | sed -e 's/[ \\t]*/ /g'`
-				AC_MSG_RESULT($py_libdir)
-			else
-				binding_python="no"
-				binding_python_reason="$py_libdir/config/Makefile or $py_prefix/include/python${py_ver}/Python.h missing"
-			fi
-
-		else
-			PYTHON_CFLAGS="`${PYTHONCONFIG} --cflags`"
-			PYTHON_LIBS="`${PYTHONCONFIG} --ldflags`"
-		fi
-	else
-		binding_python="no"
-		binding_python_reason="python executable missing"
-	fi
-fi
-if test "x${binding_python}" = xyes ; then
-	AC_DEFINE(USE_BINDING_PYTHON, 1, [Build with binding python])
-fi
-AC_SUBST(PYTHON_CFLAGS)
-AC_SUBST(PYTHON_LIBS)
-AM_CONDITIONAL(BINDING_PYTHON, test "x${binding_python}" = "xyes")
-
-# dbus
-AC_ARG_ENABLE(binding-dbus,   [  --disable-binding-dbus               don't create binding dbus], binding_dbus=$enableval;binding_dbus_reason="configure parameter")
-AC_ARG_ENABLE(binding-dbus-use-system-bus,  [  --enable-binding-dbus-use-system-bus   use system bus for dbus binding], binding_dbus_use_system_bus=$enableval)
-if test "x${binding_dbus}" = "xyes" ; then
-	PKG_CHECK_MODULES(DBUS, [dbus-glib-1], ,binding_dbus=no)
-fi
-if test "x${binding_dbus}" = "xyes" ; then
-	AC_DEFINE(USE_BINDING_DBUS, 1, [Build with binding dbus])
-	vehicle_gpsd_dbus="yes"
-	vehicle_gpsd_dbus_reason="dbus binding present"
-	speech_dbus="yes"
-	speech_dbus_reason="dbus binding present"
-fi
-if test "x${binding_dbus_use_system_bus}" = "xyes" ; then
-	AC_DEFINE(DBUS_USE_SYSTEM_BUS, 1, [Use system bus instead of session bus for binding dbus])
-fi
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-AM_CONDITIONAL(BINDING_DBUS, test "x${binding_dbus}" = "xyes")
-AM_CONDITIONAL(VEHICLE_GPSD_DBUS, test "x${vehicle_gpsd_dbus}" = "xyes")
-AM_CONDITIONAL(SPEECH_DBUS, test "x${speech_dbus}" = "xyes")
-AC_ARG_WITH(dbus-service-dir, [ --with-dbus-service-dir   specify where the dbus service dir resides], DBUS_SERVICE_DIR=$withval, DBUS_SERVICE_DIR="$datarootdir/dbus-1/services")
-AC_SUBST(DBUS_SERVICE_DIR)
-
-# win32 binding
-AC_ARG_ENABLE(binding-win32,   [  --disable-binding-win32               don't create binding win32], binding_win32=$enableval;binding_win32_reason="configure parameter")
-if test "x${binding_win32}" = "xyes" ; then
-	AC_DEFINE(USE_BINDING_WIN32, 1, [Build with binding win32])
-fi
-AM_CONDITIONAL(BINDING_WIN32, test "x${binding_win32}" = "xyes")
-
-# svg
-AC_ARG_ENABLE(svg, [  --disable-svg        disable Scalable Vector Graphics], enable_svg=$enableval, enable_svg=yes)
-AC_ARG_ENABLE(svg2png, [  --disable-svg2png        disable conversion of svgs to pngs], enable_svg2png=$enableval, enable_svg2png=yes)
-AC_ARG_ENABLE(svg2png-scaling, [  --enable-svg2png-scaling   enable conversion of svgs to pngs with specified sizes], SVG2PNG_SCALES=$enableval, SVG2PNG_SCALES="8 16 32 48 96")
-AC_ARG_ENABLE(svg2png-scaling-flag, [  --enable-svg2png-scaling-flag   enable conversion of flag svgs to pngs with specified sizes], SVG2PNG_SCALES_FLAG=$enableval, SVG2PNG_SCALES_FLAG="8 16 32 48 96")
-AC_ARG_ENABLE(svg2png-scaling-nav, [  --enable-svg2png-scaling-nav   enable conversion of nav svgs to pngs with specified sizes], SVG2PNG_SCALES_NAV=$enableval, SVG2PNG_SCALES_NAV="8 16 32 48 96")
-AC_ARG_WITH(svg2png-use-convert, [  --with-svg2png-use-convert   use imagemagick's convert for png creation], SVG2PNG_CONVERTER="convert")
-AC_ARG_WITH(svg2png-use-rsvg-convert, [  --with-svg2png-use-rsvg-convert   use librsvg's rsvg-convert for png creation], SVG2PNG_CONVERTER="rsvg-convert")
-AC_ARG_WITH(svg2png-use-inkscape, [  --with-svg2png-use-inkscape   use inkscapes internal convert routines for png creation], SVG2PNG_CONVERTER="inkscape")
-AC_ARG_WITH(svg2png-use-ksvgtopng4, [  --with-svg2png-use-ksvgtopng4   use kde4's ksvgtopng4 for png creation], SVG2PNG_CONVERTER="ksvgtopng4")
-AC_ARG_WITH(svg2png-use-ksvgtopng, [  --with-svg2png-use-ksvgtopng   use kde3's convert for png creation], SVG2PNG_CONVERTER="ksvgtopng")
-if test "x${enable_svg2png}" = "xyes" ; then
-    if test "x${SVG2PNG_CONVERTER}" = "x"; then
-        SVG2PNG_CONVERTER="rsvg-convert ksvgtopng ksvgtopng4 inkscape convert"
-    fi
-    AC_PATH_PROGS([SVG2PNG], ${SVG2PNG_CONVERTER}, [none])
-    if test "x${SVG2PNG}" = "xnone"; then
-        enable_svg2png="no"
-    fi
-fi
-AC_SUBST(SVG2PNG)
-AC_SUBST(SVG2PNG_SCALES)
-AC_SUBST(SVG2PNG_SCALES_FLAG)
-AC_SUBST(SVG2PNG_SCALES_NAV)
-AM_CONDITIONAL(USE_SVG2PNG_SCALES, test "x${SVG2PNG_SCALES}" != "xyes" -a "x${SVG2PNG_SCALES}" != "x")
-AM_CONDITIONAL(USE_SVG2PNG_SCALES_FLAG, test "x${SVG2PNG_SCALES_FLAG}" != "xyes" -a "x${SVG2PNG_SCALES_FLAG}" != "x")
-AM_CONDITIONAL(USE_SVG2PNG_SCALES_NAV, test "x${SVG2PNG_SCALES_NAV}" != "xyes" -a "x${SVG2PNG_SCALES_NAV}" != "x")
-AM_CONDITIONAL(USE_SVG2PNG, test "x${enable_svg2png}" = "xyes")
-AM_CONDITIONAL(USE_SVG, test "x${enable_svg}" = "xyes")
-
-# XSLTS
-AC_ARG_WITH(xslts, [  --with-xslts   enable processing of navit.xml with given xslt scripts], XSLTS=$withval, XSLTS="")
-AC_SUBST(XSLTS)
-AC_ARG_WITH(saxon, [ --with-saxon   specify the saxon xslt processor], SAXON=$withval, SAXON="saxon")
-AC_SUBST(SAXON)
-
-# Android Permissions
-AC_ARG_WITH(android-permissions, [  --with-android-permissions   Set additional android permissions], ANDROID_PERMISSIONS=$withval, ANDROID_PERMISSIONS="")
-AC_SUBST(ANDROID_PERMISSIONS)
-# Android Project
-AC_ARG_WITH(android-project, [  --with-android-project   Set android project], ANDROID_PROJECT=$withval, ANDROID_PROJECT="3")
-AC_SUBST(ANDROID_PROJECT)
-
-# NLS
-
-AC_ARG_ENABLE(nls,
-  [  --disable-nls        disable Native Language Support ( gettext/libintl )],
-   enable_nls=$enableval, enable_nls=yes)
-
-
-INTLIBS=""
-MOFILES=""
-POFILES=""
-POIFILES=""
-LINGUAS=""
-
-xgettext_glade=no
-if test "x$enable_nls" = "xyes"; then
-
-  AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"],[INTLIBS="-lintl" HAVEGETTEXT="yes"])
-  AC_CHECK_PROG(XGETTEXT, xgettext, xgettext)
-  AC_CHECK_PROG(MSGMERGE, msgmerge, msgmerge)
-  AC_CHECK_PROG(MSGFMT, msgfmt, msgfmt)
-
-  if test "$XGETTEXT" != ""; then 
-    if $XGETTEXT --help 2>&1 | grep illegal >/dev/null ; then
-        echo "xgettext isn't GNU version"
-        XGETTEXT=""
-    else
-	if echo '<test/>' | $XGETTEXT -L Glade - ; then
-	    xgettext_glade=yes
-	fi
-    fi
-  fi
-
-  if test "$XGETTEXT" != "" ; then
-     PO=""
-     if test "$LINGUAS" = ""; then
-           ling=` (cd $srcdir/po; /bin/ls *.po.in) `
-  	   for l in $ling; do
-	        lcode=`basename $l .po.in`
-	        LINGUAS="$LINGUAS$lcode "
-           done
-    fi
-    AC_DEFINE(USE_NATIVE_LANGUAGE_SUPPORT, [1], [NLS Please])
-    echo "xgettext and gettext() exist; will build i18n support for $LINGUAS"
-  else
-   LINGUAS=""
-   PO=""
-   echo "xgettext doesn't exist; will not build i18n support"
-   enable_nls=no
- fi
- for lang in $LINGUAS; do
-    MOFILES="$MOFILES $lang.mo"
- done
- for lang in $LINGUAS; do
-    POFILES="$POFILES $lang.po"
- done
- for lang in $LINGUAS; do
-    POIFILES="$POIFILES $lang.po.in"
- done
-
-AC_SUBST(INTLIBS)
-AC_SUBST(MOFILES)
-AC_SUBST(POFILES)
-AC_SUBST(POIFILES)
-AM_GNU_GETTEXT_VERSION
-AM_GNU_GETTEXT(no-libtool, need-ngettext, \$(top_builddir)/intl/)
-if test "x${shared_libnavit}" = "xyes" -a "x${win32ce}" = "xyes"; then
-	INTLLIBS="\$(top_builddir)/intl/libintl.la"
-	LIBINTL=$INTLLIBS
-	LTLIBINTL=$INTLLIBS
-fi
-AC_SUBST(LIBINTL)
-AC_SUBST(LTLIBINTL)
-if test x"$LIBINTL" != "x" ;then
-	CFLAGS="$CFLAGS -I\$(top_builddir)/intl/"
-fi
-
-fi
-AM_CONDITIONAL(USE_NATIVE_LANGUAGE_SUPPORT, [test "x$enable_nls" = "xyes"])
-AM_CONDITIONAL(XGETTEXT_GLADE, [test "x$xgettext_glade" = "xyes"])
-AC_CHECK_HEADER(
-	byteswap.h,
-	AC_DEFINE(
-		[HAVE_BYTESWAP_H],
-		[1],
-		[Define to 1 if you have byteswap.h],
-		)
-		,
-)
-
-AC_CHECK_HEADER(sys/endian.h,AC_DEFINE([USE_SYS_ENDIAN_H], [1], [Define to 1 if you have sys/endian.h],),)
-
-PACKAGE=navit
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-
-AC_CHECK_HEADER(wordexp.h,wordexp_h=yes,wordexp_h=no;NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/wordexp";WORDEXP_LIBS="-L\$(top_builddir)/navit/support/wordexp -lsupport_wordexp")
-AM_CONDITIONAL(SUPPORT_WORDEXP, [test "x$wordexp_h" = "xno"])
-
-support_libc=no
-AC_ARG_ENABLE(support_libc, [  --enable-support-libc enable builtin mini libc ], support_libc=$enableval)
-AM_CONDITIONAL(SUPPORT_LIBC, [test "x$support_libc" = "xyes"])
-if test "x$support_libc" = "xyes"; then
-	CFLAGS="$CFLAGS -I\$(top_srcdir)/navit/support/libc"
-	LIBC_LIBS="-L\$(top_builddir)/navit/support/libc -lsupport_libc"
-fi
-
-## graphics
-AC_ARG_ENABLE(graphics, [  --disable-graphics            disable graphics], graphics=$enableval;graphics_reason="configure parameter")
-AM_CONDITIONAL(GRAPHICS, test "x${graphics}" = "xyes")
-if test "x$graphics" = "xyes"; then
-	AC_DEFINE([USE_GRAPHICS],[1],Define to 1 if you want to use graphics.)
-fi	
-
-# gd
-
-# android
-AC_ARG_ENABLE(graphics-android, [  --disable-graphics-android            disable graphics type android], graphics_android=$enableval;graphics_android_reason="configure parameter")
-AM_CONDITIONAL(GRAPHICS_ANDROID, test "x${graphics_android}" = "xyes")
-# gd
-AC_ARG_ENABLE(graphics-gd, [  --enable-graphics-gd                enable graphics type gd], graphics_gd=$enableval;graphics_gd_reason="configure parameter")
-if test "x${graphics_gd}" = "xyes" ; then
-	if test -z "$GDLIB_CONFIG"; then
-            AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config], [])
-        fi
-	AC_MSG_CHECKING([for gdlib with $GDLIB_CONFIG])
-	if test ! -x "$GDLIB_CONFIG"; then
-	    if test "x${GDLIB_CONFIG}" = "x" ; then
-	    	 graphics_gd_reason="$GDLIB_CONFIG not executable"
-	    else
-	    	 graphics_gd_reason="gdlib-config missing"
-            fi
-	    graphics_gd=no 
-            AC_MSG_RESULT([no])
-	else
-	    if test "x${GD_CFLAGS}" = "x" ; then
-		    GD_CFLAGS="-I`$GDLIB_CONFIG --includedir`"
-	    fi
-	    if test "x${GD_LIBS}" = "x" ; then
-		    GD_LIBS="-L`$GDLIB_CONFIG --libdir` -lgd `$GDLIB_CONFIG --libs`"
-            fi
-	    AC_SUBST(GD_CFLAGS)
-	    AC_SUBST(GD_LIBS)
-            AC_MSG_RESULT([yes])
-       	fi 
-fi
-AM_CONDITIONAL(GRAPHICS_GD, test "x${graphics_gd}" = "xyes")
-AC_CHECK_HEADER(
-	sys/shm.h,
-	AC_DEFINE(
-		[HAVE_SHMEM],
-		[],
-		Define to 1 if you have shared memory
-	)
-)
-AC_CHECK_HEADER(
-	X11/xpm.h,
-	AC_DEFINE(
-		[HAVE_XPM],
-		[],
-		Define to 1 if you have xpm header
-	)
-)
-AC_CHECK_HEADER(
-	getopt.h,
-	AC_DEFINE(
-		[HAVE_GETOPT_H],
-		[],
-		Define to 1 if you have the getopt header
-	)
-)
-if test "x${graphics_gd}" = "xyes" ; then
-	save_CPPFLAGS=$CPPFLAGS
-	save_LIBS=$LIBS
-	LIBS="$GD_LIBS $LIBS"
-	CPPFLAGS="$GD_CFLAGS $CPPFLAGS"
-	AC_TRY_LINK([#include <gd.h>], [gdImageCreateFromPng(0);],AC_MSG_RESULT(yes);AC_DEFINE(HAVE_GRAPHICS_GD_PNG, 1, [Define to 1 if you have png support in gd.]),AC_MSG_RESULT(no))
-	CPPFLAGS=$save_CPPFLAGS
-	LIBS=$save_LIBS
-fi
-
-# gtk_drawing_area
-AC_ARG_ENABLE(graphics-gtk-drawing-area, [  --disable-graphics-gtk-drawing-area disable graphics type gtk_drawing_area], graphics_gtk_drawing_area=$enableval;graphics_gtk_drawing_area_reason="configure parameter")
-AM_CONDITIONAL(GRAPHICS_GTK_DRAWING_AREA, [test "x${graphics_gtk_drawing_area}" = "xyes"])
-# null
-AC_ARG_ENABLE(graphics-null, [  --disable-graphics-null            disable graphics type null], graphics_null=$enableval;graphics_null_reason="configure parameter")
-AM_CONDITIONAL(GRAPHICS_NULL, test "x${graphics_null}" = "xyes")
-# win32
-AC_ARG_ENABLE(graphics-win32, [  --disable-graphics-win32            disable graphics type win32], graphics_win32=$enableval;graphics_win32_reason="configure parameter")
-AM_CONDITIONAL(GRAPHICS_WIN32, test "x${graphics_win32}" = "xyes")
-# qt_qpainter
-AC_ARG_ENABLE(graphics-qt-qpainter, [  --disable-graphics-qt-qpainter      disable graphics type qt-qpainter], graphics_qt_qpainter=$enableval;graphics_qt_qpainter_reason="configure parameter")
-if test "x${graphics_qt_qpainter}" = "xyes" -a "x${QT_GUI_CFLAGS}" = "x" -a "x${QT_GUI_LIBS}" = "x"; then
-	PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore],graphics_qt_qpainter=yes,graphics_qt_qpainter=no;graphics_qt_qpainter_reason="Packages QtGui and/or QtCore missing")
-	if test "x${graphics_qt_qpainter}" = "xno"; then
-		PKG_CHECK_MODULES(QT_GUI, [qt-mt],graphics_qt_qpainter=yes;graphics_qt_qpainter_reason="Package qt-mt present",graphics_qt_qpainter=no)
-	fi
-fi
-if test "x${graphics_qt_qpainter}" = "xyes" ; then
-        PKG_CHECK_MODULES(QT_SVG, [QtSvg], have_qt_svg=yes, have_qt_svg=no)
-	if test "x${have_qt_svg}" = "xyes"; then
-        	AC_DEFINE([HAVE_QT_SVG],[],Define to 1 if qt supports svg)
-	fi
-fi
-if test "x${graphics_qt_qpainter}" = "xyes" ; then
-	AC_DEFINE(USE_GRAPICS_QT_QPAINTER, 1, [Build with graphics qt_qpainter])
-fi
-AC_SUBST(QT_GUI_CFLAGS)
-AC_SUBST(QT_GUI_LIBS)
-AC_SUBST(QT_SVG_CFLAGS)
-AC_SUBST(QT_SVG_LIBS)
-AM_CONDITIONAL(GRAPHICS_QT_QPAINTER, test "x${graphics_qt_qpainter}" = "xyes")
-MOC=`$PKG_CONFIG QtGui --variable=moc_location`
-if test "x${MOC}" = "x"; then
-	AC_CHECK_PROG(MOC, moc, moc)
-fi
-AC_SUBST(MOC)
-
-
-## map
-# binfile
-AC_ARG_ENABLE(map-binfile, [  --disable-map-binfile            disable map binfile], map_binfile=$enableval;map_binfile_reason="configure parameter")
-AM_CONDITIONAL(MAP_BINFILE, test "x${map_binfile}" = "xyes")
-# filter
-AC_ARG_ENABLE(map-filter, [  --disable-map-filter            disable map filter], map_filter=$enableval;map_filter_reason="configure parameter")
-AM_CONDITIONAL(MAP_FILTER, test "x${map_filter}" = "xyes")
-# mg
-AC_ARG_ENABLE(map-mg, [  --disable-map-mg            disable map mg], map_mg=$enableval;map_mg_reason="configure parameter")
-AM_CONDITIONAL(MAP_MG, test "x${map_mg}" = "xyes")
-# shapefile
-AC_ARG_ENABLE(map-shapefile, [  --disable-map-shapefile            disable map shapefile], map_shapefile=$enableval;map_shapefile_reason="configure parameter")
-AM_CONDITIONAL(MAP_SHAPEFILE, test "x${map_shapefile}" = "xyes")
-# textfile
-AC_ARG_ENABLE(map-textfile, [  --disable-map-textfile            disable map textfile], map_textfile=$enableval;map_textfile_reason="configure parameter")
-AM_CONDITIONAL(MAP_TEXTFILE, test "x${map_textfile}" = "xyes")
-# csv
-AC_ARG_ENABLE(map-csv, [  --disable-map-csv            disable map csv], map_csv=$enableval;map_csv_reason="configure parameter")
-AM_CONDITIONAL(MAP_CSV, test "x${map_csv}" = "xyes")
-
-## osd
-# core
-AC_ARG_ENABLE(osd-core, [  --disable-osd-core            disable osd core], osd_core=$enableval;osd_core_reason="configure parameter")
-AM_CONDITIONAL(OSD_CORE, test "x${osd_core}" = "xyes")
-
-## gui
-# gtk
-AC_ARG_ENABLE(gui-gtk, [  --disable-gui-gtk                   disable gui type gtk ], gui_gtk=$enableval)
-AM_CONDITIONAL(GUI_GTK, [test "x${gui_gtk}" = "xyes"])
-# internal
-AC_ARG_ENABLE(gui-internal, [  --disable-gui-internal              disable gui type internal], gui_internal=$enableval;gui_internal_reason="configure parameter")
-AM_CONDITIONAL(GUI_INTERNAL, test "x${gui_internal}" = "xyes")
-# win32
-AC_ARG_ENABLE(gui-win32, [  --disable-gui-win32                 disable gui type win32], gui_win32=$enableval;gui_win32_reason="configure parameter")
-AM_CONDITIONAL(GUI_WIN32, test "x${gui_win32}" = "xyes")
-# qml
-AC_ARG_ENABLE(gui-qml, [  --disable-gui-qml              disable gui type QML], gui_qml=$enableval;gui_qml_reason="configure parameter")
-if test "x${gui_qml}" = "xyes" -a "x${QT_GUI_CFLAGS}" = "x" -a "x${QT_GUI_LIBS}" = "x"; then
-	PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore], ,gui_qml=no;gui_qml_reason="Packages QtGui and/or QtCore are missing")
-fi
-if test "x${gui_qml}" = "xyes" -a "x${QT_XML_CFLAGS}" = "x" -a "x${QT_XML_LIBS}" = "x"; then
-	PKG_CHECK_MODULES(QT_XML, [QtXml], ,gui_qml=no;gui_qml_reason="Package QtXml is missing")
-fi
-if test "x${gui_qml}" = "xyes" -a "x${QT_DECLARATIVE_CFLAGS}" = "x" -a "x${QT_DECLARATIVE_LIBS}" = "x"; then
-	PKG_CHECK_MODULES(QT_DECLARATIVE, [QtDeclarative >= 4.6.0 ], ,gui_qml=no;gui_qml_reason="Packages QtDeclarative is missing")
-fi
-if test "x${gui_qml}" = "xyes" ; then
-	AC_DEFINE(USE_GUI_QML, 1, [Build with gui qml])
-fi
-AC_SUBST(QT_GUI_CFLAGS)
-AC_SUBST(QT_GUI_LIBS)
-AC_SUBST(QT_DECLARATIVE_CFLAGS)
-AC_SUBST(QT_DECLARATIVE_LIBS)
-AC_SUBST(QT_XML_CFLAGS)
-AC_SUBST(QT_XML_LIBS)
-AM_CONDITIONAL(GUI_QML, test "x${gui_qml}" = "xyes")
-
-## plugins
-# pedestrian
-AC_ARG_ENABLE(plugin-pedestrian, [  --enable-plugin-pedestrian          enable pedestrian plugin], plugin_pedestrian=$enableval;plugin_pedestrian_reason="configure parameter")
-AM_CONDITIONAL(PLUGIN_PEDESTRIAN, test "x${plugin_pedestrian}" = "xyes")
-
-## routing
-AC_ARG_ENABLE(routing, [  --disable-routing            disable routing], routing=$enableval;routing_reason="configure parameter")
-AM_CONDITIONAL(ROUTING, test "x${routing}" = "xyes")
-if test "x$routing" = "xyes"; then
-	AC_DEFINE([USE_ROUTING],[1],Define to 1 if you want to have routing.)
-fi
-
-## speech
-# android
-AC_ARG_ENABLE(speech-android, [  --disable-speech-android            disable speech type android], speech_android=$enableval;speech_android_reason="configure parameter")
-AM_CONDITIONAL(SPEECH_ANDROID, test "x${speech_android}" = "xyes")
-# cmdline
-AC_ARG_ENABLE(speech-cmdline, [  --disable-speech-cmdline            disable speech type cmdline], speech_cmdline=$enableval;speech_cmdline_reason="configure parameter")
-AM_CONDITIONAL(SPEECH_CMDLINE, test "x${speech_cmdline}" = "xyes")
-# espeak
-AC_ARG_ENABLE(speech-espeak, [  --disable-speech-espeak            disable speech type espeak], speech_espeak=$enableval;speech_espeak_reason="configure parameter")
-AM_CONDITIONAL(SPEECH_ESPEAK, test "x${speech_espeak}" = "xyes")
-# speech-dispatcher
-AC_ARG_ENABLE(speech-speech-dispatcher, [  --disable-speech-speech-dispatcher  disable speech type speech-dispatcher], speech_speech_dispatcher=$enableval;speech_speech_dispatcher_reason="configure parameter")
-if test "x$speech_speech_dispatcher" = "xyes"; then
-	AC_CHECK_HEADER(libspeechd.h, AC_DEFINE([HAVE_LIBSPEECHD],[],Define to 1 if you have the <libspeechd.h> header file.) SPEECHD_LIBS="-lspeechd",  speech_speech_dispatcher=no; speech_speech_dispatcher_reason="libspeechd.h missing")
-fi
-AC_SUBST(SPEECHD_CFLAGS)
-AC_SUBST(SPEECHD_LIBS)
-AM_CONDITIONAL(SPEECH_SPEECH_DISPATCHER, test "x${speech_speech_dispatcher}" = "xyes")
-AM_CONDITIONAL(SUPPORT_ESPEAK, test "x${support_espeak}" = "xyes")
-
-## vehicle
-# android
-AC_ARG_ENABLE(vehicle-android, [  --disable-vehicle-android             disable vehicle type android], vehicle_android=$enableval;vehicle_android_reason="configure parameter")
-AM_CONDITIONAL(VEHICLE_ANDROID, test "x${vehicle_android}" = "xyes")
-# demo
-AC_ARG_ENABLE(vehicle-demo, [  --disable-vehicle-demo              disable vehicle type demo], vehicle_demo=$enableval;vehicle_demo_reason="configure parameter")
-AM_CONDITIONAL(VEHICLE_DEMO, test "x${vehicle_demo}" = "xyes")
-# file
-AC_ARG_ENABLE(vehicle-file, [  --disable-vehicle-file              disable vehicle type file], vehicle_file=$enableval;vehicle_file_reason="configure parameter")
-AM_CONDITIONAL(VEHICLE_FILE, test "x${vehicle_file}" = "xyes")
-# gpsd
-# We accept even old, buggy versions of libgps, because N810 uses an old version (see #1179).
-AC_ARG_ENABLE(vehicle-gpsd, [  --disable-vehicle-gpsd              disable vehicle type gpsd], vehicle_gpsd=$enableval;vehicle_gpsd_reason="configure parameter")
-if test "x${vehicle_gpsd}" = xyes
-then
-	PKG_CHECK_MODULES([GPSD], [libgps], have_libgps="yes", have_libgps="no")
-	if test "x$have_libgps" = "xyes"; then
-		AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have libgps.)
-		PKG_CHECK_MODULES([LIBGPS19], [libgps >= 2.90], have_libgps19="yes", have_libgps19="no")
-		if test "x$have_libgps19" = "xyes"; then
-			AC_DEFINE([HAVE_LIBGPS19],[],Define to 1 if you have libgps19.)
-		fi
-	else
-		AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h and no gpsd pkgconfig" )
-	fi
-fi
-AC_SUBST(GPSD_CFLAGS)
-AC_SUBST(GPSD_LIBS)
-AM_CONDITIONAL(VEHICLE_GPSD, [test "x${vehicle_gpsd}" = "xyes"])
-# gypsy
-AC_ARG_ENABLE(vehicle-gypsy,[  --disable-vehicle-gypsy             disable vehicle type gypsy], vehicle_gypsy=$enableval;vehicle_gypsy_reason="configure parameter")
-if test "x${vehicle_gypsy}" = "xyes"
-then
-	PKG_CHECK_MODULES(GYPSY, gypsy, ,vehicle_gypsy=no;vehicle_gypsy_reason="package gypsy missing")
-fi
-AC_SUBST(GYPSY_CFLAGS)
-AC_SUBST(GYPSY_LIBS)
-AM_CONDITIONAL(VEHICLE_GYPSY, test "x${vehicle_gypsy}" = "xyes")
-# maemo
-AC_ARG_ENABLE(vehicle-maemo, [  --disable-vehicle-maemo             disable vehicle type maemo], vehicle_maemo=$enableval;vehicle_maemo_reason="configure parameter")
-if test "x${vehicle_maemo}" = "xyes" ; then
-	PKG_CHECK_MODULES(LIBLOCATION, liblocation, [
-		AC_SUBST(LIBLOCATION_CFLAGS)
-		AC_SUBST(LIBLOCATION_LIBS)
-		], [
-		AC_MSG_RESULT(no)
-		vehicle_maemo=no
-		vehicle_maemo_reason="no maemo location library found"
-	])
-fi
-AM_CONDITIONAL(VEHICLE_MAEMO, test "x${vehicle_maemo}" = "xyes")
-# null
-AC_ARG_ENABLE(vehicle-null, [  --enable-vehicle-null             enable vehicle type null], vehicle_null=$enableval;vehicle_null_reason="configure parameter")
-AM_CONDITIONAL(VEHICLE_NULL, test "x${vehicle_null}" = "xyes")
-# wince
-AC_ARG_ENABLE(vehicle-wince, [  --disable-vehicle-wince             disable vehicle type wince], vehicle_wince=$enableval;vehicle_wince_reason="configure parameter")
-AM_CONDITIONAL(VEHICLE_WINCE, test "x${vehicle_wince}" = "xyes")
-# iphone
-AC_ARG_ENABLE(vehicle-iphone, [  --disable-vehicle-iphone              disable vehicle type iphone], vehicle_iphone=$enableval;vehicle_iphone_reason="configure parameter")
-AM_CONDITIONAL(VEHICLE_IPHONE, test "x${vehicle_iphone}" = "xyes")
-if test "x${vehicle_iphone}" = "xyes"
-then
-	IPHONE_LIBS=-Wl,-framework,CoreLocation
-fi
-AC_SUBST(IPHONE_CFLAGS)
-AC_SUBST(IPHONE_LIBS)
-# webos
-AC_ARG_ENABLE(vehicle-webos, [  --enable-vehicle-webos              enable vehicle type webos], vehicle_webos=$enableval;vehicle_webos_reason="configure parameter")
-AM_CONDITIONAL(VEHICLE_WEBOS, test "x${vehicle_webos}" = "xyes")
-if test "x${vehicle_webos}" = "xyes"
-then
-	AC_DEFINE(USE_WEBOS,[],Build with webOS support)
-	LIBPDL_CFLAGS="$SDL_CFLAGS -I/usr/local/include"
-	LIBPDL_LIBS="-L/usr/local/lib -lpdl"
-	AC_SUBST(LIBPDL_CFLAGS)
-	AC_SUBST(LIBPDL_LIBS)
-fi
-NAVIT_CFLAGS="$NAVIT_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS"
-NAVIT_LIBS="$NAVIT_LIBS $GLIB_LIBS $GMODULE_LIBS $LIBINTL"
-AC_SUBST(NAVIT_CFLAGS)
-AC_SUBST(NAVIT_LIBS)
-AC_SUBST(WORDEXP_LIBS)
-AC_SUBST(LIBC_LIBS)
-AC_SUBST(WINDRES)
-
-AC_CONFIG_FILES([
-Makefile
-navit/Makefile
-navit/autoload/Makefile
-navit/autoload/osso/Makefile
-navit/binding/Makefile
-navit/binding/python/Makefile
-navit/binding/dbus/Makefile
-navit/binding/win32/Makefile
-navit/map/Makefile
-navit/map/mg/Makefile
-navit/map/textfile/Makefile
-navit/map/csv/Makefile
-navit/map/shapefile/Makefile
-navit/map/filter/Makefile
-navit/map/binfile/Makefile
-navit/map/garmin/Makefile
-navit/maptool/Makefile
-navit/fib-1.1/Makefile
-navit/font/Makefile
-navit/font/freetype/Makefile
-navit/fonts/Makefile
-navit/graphics/Makefile
-navit/graphics/android/Makefile
-navit/graphics/gd/Makefile
-navit/graphics/gtk_drawing_area/Makefile
-navit/graphics/opengl/Makefile
-navit/graphics/null/Makefile
-navit/graphics/sdl/Makefile
-navit/graphics/qt_qpainter/Makefile
-navit/graphics/win32/Makefile
-navit/gui/Makefile
-navit/gui/gtk/Makefile
-navit/gui/internal/Makefile
-navit/gui/win32/Makefile
-navit/gui/qml/Makefile
-navit/gui/qml/skins/Makefile
-navit/gui/qml/skins/navit/Makefile
-navit/osd/Makefile
-navit/osd/core/Makefile
-navit/plugin/Makefile
-navit/plugin/pedestrian/Makefile
-navit/speech/Makefile
-navit/speech/android/Makefile
-navit/speech/cmdline/Makefile
-navit/speech/dbus/Makefile
-navit/speech/espeak/Makefile
-navit/speech/speech_dispatcher/Makefile
-navit/support/Makefile
-navit/support/espeak/Makefile
-navit/support/ezxml/Makefile
-navit/support/glib/Makefile
-navit/support/libc/Makefile
-navit/support/libpng/Makefile
-navit/support/shapefile/Makefile
-navit/support/win32/Makefile
-navit/support/wordexp/Makefile
-navit/support/zlib/Makefile
-navit/vehicle/Makefile
-navit/vehicle/android/Makefile
-navit/vehicle/file/Makefile
-navit/vehicle/gpsd/Makefile
-navit/vehicle/gpsd_dbus/Makefile
-navit/vehicle/gypsy/Makefile
-navit/vehicle/maemo/Makefile
-navit/vehicle/null/Makefile
-navit/vehicle/demo/Makefile
-navit/vehicle/wince/Makefile
-navit/vehicle/iphone/Makefile
-navit/vehicle/webos/Makefile
-navit/xpm/Makefile
-navit/maps/Makefile
-intl/Makefile
-po/Makefile
-man/Makefile
-])
-#src/data/garmin_img/Makefile
-
-AC_OUTPUT
-
-
-echo ""
-echo ""
-echo "Summary of your installation :"
-# FIXME : maybe elaborate missing dependencies
-if test x"$graphics_sdl" != xyes
-	then
-        sdl_failures="(libsdl maybe?) "
-fi
-if test x"$glut" != xyes
-       then
-        sdl_failures=$sdl_failures"glut "
-fi
-if test -z "$sdl_failures"
-        then
-        echo "OpenGL gui  : ENABLED, with $CEGUI_LIBS"
-        else
-	         echo "OpenGL gui  : DISABLED : you are missing $sdl_failures"
-fi
-if test x"$enable_hildon" = xyes
-	then
-        echo "Maemo/Hildon: ENABLED"
-        else
-        echo "Maemo/Hildon: DISABLED"
-fi
-if test x"$enable_osso" = xyes
-	then
-        echo "Maemo/OSSO: ENABLED"
-        else
-        echo "Maemo/OSSO: DISABLED"
-fi
-if test x"${USE_GARMIN}" = xyes
-	then
-	if test "x$use_libgarmin" = "xyes"
-		then
-		echo "Garmin IMG  : ENABLED"
-		else
-		echo "Garmin IMG  : DISABLED (you don't have libgarmin)"
-	fi
-	else 
-		echo "Garmin IMG  : DISABLED (you requested it)"
-fi
-
-if test x"$LIBINTL" = "x" ;then
-	nls_libs="system gettext support"
-else
-	nls_libs="$LIBINTL"
-fi
-echo "Plugins:             $plugins ($plugins_reason)"
-echo "Postgresql:          $postgresql ($postgresql_reason)"
-echo "Samplemap:           $samplemap ($samplemap_reason)"
-echo "NLS Support:         $enable_nls ($nls_libs)"
-echo "Routing:             $routing ($routing_reason)"
-echo "Font renderers:"
-echo "  freetype:          $font_freetype ($font_freetype_reason)"
-echo "  FriBidi enabled:   $fribidi ($fribidi_reason)"
-
-echo "Graphics types: $graphics ($graphics_reason)"
-echo "  android:  $graphics_android ($graphics_android_reason)"
-echo "  gtk_drawing_area:  $graphics_gtk_drawing_area ($graphics_gtk_drawing_area_reason)"
-echo "  null:              $graphics_null ($graphics_null_reason)"
-echo "  qt_qpainter:       $graphics_qt_qpainter ($graphics_qt_qpainter_reason)"
-echo "  win32:             $graphics_win32 ($graphics_win32_reason)"
-echo "  OpenGL:            $graphics_opengl ($graphics_opengl_reason)"
-echo "  gd:                $graphics_gd ($graphics_gd_reason)"
-echo "  sdl:               $graphics_sdl ($graphics_sdl_reason)"
-
-echo "GUI types:"
-echo "  gtk:               $gui_gtk ($gui_gtk_reason)"
-echo "  internal:          $gui_internal ($gui_internal_reason)"
-echo "  win32:             $gui_win32 ($gui_win32_reason)"
-echo "  qml:               $gui_qml ($gui_qml_reason)"
-
-echo "Map types:"
-echo "  binfile:           $map_binfile ($map_binfile_reason)"
-echo "  filter:	           $map_filter ($map_filter_reason)"
-echo "  mg:                $map_mg ($map_mg_reason)"
-echo "  shapefile:         $map_shapefile ($map_shapefile_reason)"
-echo "  textfile:          $map_textfile ($map_textfile_reason)"
-echo "  csv:          $map_csv ($map_csv_reason)"
-
-
-echo "Bindings:"
-echo "  dbus:              $binding_dbus ($binding_dbus_reason)"
-echo "  python:            $binding_python ($binding_python_reason)"
-
-echo "OSD types:"
-echo "  core:              $osd_core ($osd_core_reason)"
-
-echo "Plugins:"
-echo "  pedestrian:	   $plugin_pedestrian ($plugin_pedestrian_reason)"
-
-echo "Speech types:"
-echo "  android:           $speech_android ($speech_android_reason)"
-echo "  cmdline:           $speech_cmdline ($speech_cmdline_reason)"
-echo "  dbus:              $speech_dbus ($speech_dbus_reason)"
-echo "  espeak:            $speech_espeak ($speech_espeak_reason)"
-echo "  speech_dispatcher: $speech_speech_dispatcher ($speech_speech_dispatcher_reason)"
-
-echo "Vehicle types:"
-echo "  android:           $vehicle_android ($vehicle_android_reason)"
-echo "  demo:              $vehicle_demo ($vehicle_demo_reason)"
-echo "  file:              $vehicle_file ($vehicle_file_reason)"
-echo "  gpsd:              $vehicle_gpsd ($vehicle_gpsd_reason)"
-echo "  gpsd_dbus:         $vehicle_gpsd_dbus ($vehicle_gpsd_dbus_reason)"
-echo "  gypsy:             $vehicle_gypsy ($vehicle_gypsy_reason)"
-echo "  maemo:             $vehicle_maemo ($vehicle_maemo_reason)"
-echo "  null:              $vehicle_null ($vehicle_null_reason)"
-echo "  wince:             $vehicle_wince ($vehicle_wince_reason)"
-echo "  iphone:            $vehicle_iphone ($vehicle_iphone_reason)"
-echo "  webos:             $vehicle_webos ($vehicle_webos_reason)"
-
-if  test "x${gtk2_pkgconfig}" != "xyes" -a "x${gui_win32}" != "xyes" -a "x${gui_internal}" != "xyes" -a "x${gui_qml}" != "xyes"
-then
-	echo ""
-	echo "" 
-	echo "*** WARNING! you have no gui that can be built! ***"
-	echo "Please install the dependency for at least gtk or sdl gui"
-	echo "For more details, see the wiki at http://wiki.navit-project.org/"
-	echo "" 
-fi
-
-echo "Support for autotools will be removed soon from navit, please use cmake instead"
-sleep 5
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index 44d6c2d5e..000000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-dist_man_MANS=maptool.1 navit.1
diff --git a/navit/Makefile.am b/navit/Makefile.am
deleted file mode 100644
index 16cb81d58..000000000
--- a/navit/Makefile.am
+++ /dev/null
@@ -1,248 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-comma=,
-SUBDIRS=fib-1.1 support
-if PLUGINS
-  SUBDIRS += .
-endif
-DIST_SUBDIRS=autoload binding map maptool fib-1.1 font fonts gui graphics osd plugin speech support vehicle xpm maps
-SUBDIRS+=autoload binding map font gui graphics osd plugin speech vehicle xpm
-
-MODULES = $(wildcard $(top_builddir)/navit/binding/*/*.la $(top_builddir)/navit/font/*/*.la $(top_builddir)/navit/graphics/*/*.la $(top_builddir)/navit/gui/*/*.la $(top_builddir)/navit/map/*/*.la $(top_builddir)/navit/osd/*/*.la $(top_builddir)/navit/speech/*/*.la $(top_builddir)/navit/vehicle/*/*.la)
-
-if FONTS
-  SUBDIRS += fonts
-endif
-if !PLUGINS
-  SUBDIRS += .
-endif
-
-if MAPTOOL
-  SUBDIRS += maptool
-endif
-
-if BUILD_SAMPLEMAP
-  SUBDIRS += maps
-endif
-
-
-AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit
-BUILT_SOURCES = version.h navit_config.h
-
-if BIN_NAVIT
-  bin_PROGRAMS = navit
-endif
-
-if SHARED_LIBNAVIT
-  lib_LTLIBRARIES        = lib@LIBNAVIT@.la
-  lib@LIBNAVIT@_la_LDFLAGS = -avoid-version @MODULE_LDFLAGS@ @NAVIT_SOCKET_LDFLAGS@ -no-undefined -Wl,--no-undefined
-else
-  noinst_LTLIBRARIES        = lib@LIBNAVIT@.la
-endif
-lib@LIBNAVIT@_la_LIBADD = @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @INTLLIBS@ -Lfib-1.1 -lfib @MODULE_LIBADD@ @CRYPTO_LIBS@
-
-if SUPPORT_WIN32CE
-  lib@LIBNAVIT@_la_LIBADD += -Lsupport/libc -lsupport_libc
-endif
-
-pkgdata_DATA = navit.xml
-
-EXTRA_DIST = navit_shipped.xml navit.dtd
-
-lib@LIBNAVIT@_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c command.c config_.c coord.c country.c data_window.c debug.c \
-	event.c event_glib.h file.c geom.c graphics.c gui.c item.c layout.c log.c main.c map.c maps.c \
-	linguistics.c mapset.c maptype.c menu.c messages.c bookmarks.c bookmarks.h navit.c navigation.c osd.c param.c phrase.c plugin.c popup.c \
-	profile.c profile_option.c projection.c roadprofile.c route.c search.c search_houseno_interpol.c script.c speech.c start_real.c \
-	transform.c track.c util.c vehicle.c vehicleprofile.c xmlconfig.c \
-	announcement.h atom.h attr.h attr_def.h cache.h callback.h color.h command.h config_.h coord.h country.h \
-	android.h data.h data_window.h data_window_int.h debug.h destination.h draw_info.h endianess.h event.h \
-	file.h geom.h graphics.h gtkext.h gui.h item.h item_def.h keys.h log.h layer.h layout.h linguistics.h main.h map-share.h map.h\
-	map_data.h mapset.h maptype.h menu.h messages.h navigation.h navit.h osd.h \
-	param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h roadprofile.h search.h search_houseno_interpol.h \
-	speech.h start_real.h transform.h track.h types.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \
-	navit_lfs.h navit_nls.c navit_nls.h sunriset.c sunriset.h glib_slice.h
-
-XSLTS=@XSLTS@
-navit.xml: navit_shipped.xml  $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))) navit_android_xml
-	cp $< navit.xml.new
-	if [ ! -f navit.dtd ]; then cp -f $(top_srcdir)/navit/navit.dtd .; fi
-	for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then echo "Applying $$i" ; @SAXON@ -snone navit.xml.new $$i >navit.xml.tmp || exit ; mv -f navit.xml.tmp navit.xml.new || exit ; fi ; done
-	mv -f navit.xml.new navit.xml
-	rm -f navit.xml.tmp
-
-navit_android_xml: navit_shipped.xml
-if SUPPORT_ANDROID
-#	new android xml files for (mdpi,ldpi,hdpi)
-	cp $(srcdir)/navit_shipped.xml navit_android.xml.new
-	if [ ! -f navit.dtd ]; then cp -f $(top_srcdir)/navit/navit.dtd .; fi
-
-#	# now apply any other xslt files (this would allow for pedestrian plugin)
-#	for i in $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))); do if [ "$${i%.xslt}" != "$$i" ]; then j=`basename $$i` ; if [ "$$j" != "android.xslt" ] ; then echo "Android: Applying $$i" ; @SAXON@ -snone navit_android.xml.new $(srcdir)/"$$i" >navit_android.xml.new.tmp || exit ; mv navit_android.xml.new.tmp navit_android.xml.new || exit ; fi ; fi ; done
-#	# for now disable pedestrian plugin (zoff99)
-
-	@SAXON@ -snone navit_android.xml.new $(srcdir)/xslt/android_mdpi.xslt >navit_android_mdpi.xml.tmp
-	@SAXON@ -snone navit_android.xml.new $(srcdir)/xslt/android_ldpi.xslt >navit_android_ldpi.xml.tmp
-	@SAXON@ -snone navit_android.xml.new $(srcdir)/xslt/android_hdpi.xslt >navit_android_hdpi.xml.tmp
-	rm -f navit_android.xml.new
-	rm -f navit_android.xml.new.tmp
-	mv -f navit_android_mdpi.xml.tmp navit_android_mdpi.xml
-	mv -f navit_android_ldpi.xml.tmp navit_android_ldpi.xml
-	mv -f navit_android_hdpi.xml.tmp navit_android_hdpi.xml
-	rm -f navit_android_mdpi.xml.tmp
-	rm -f navit_android_ldpi.xml.tmp
-	rm -f navit_android_hdpi.xml.tmp
-else
-	echo "no Android support"
-endif
-
-if SUPPORT_ANDROID
-  lib@LIBNAVIT@_la_SOURCES += android.c
-  navit_SOURCES =
-  navit_LDADD =
-
-v_int = $$(cat $(srcdir)/android/Android_Market_Version_int.txt|grep v_int|cut -d ":" -f 2)
-v_name = "0.5.0-"$$(LANG=C svnversion $(top_srcdir) 2> /dev/null|tr -d ":A-Z" 2> /dev/null)
-
-android/AndroidManifest.xml: android/AndroidManifest.xml.in
-	mkdir -p $(builddir)/android
-	sed '0,/<uses-sdk/!d' <$< >$@
-	for i in $(subst $(comma), ,@ANDROID_PERMISSIONS@); do echo "    <uses-permission android:name=\"android.permission.$$i\" />" >>$@; done
-	sed '0,/<uses-sdk/d' <$< >>$@
-	sed -e "s/@ANDROID_VERSION_INT@/$(v_int)/" <$@ >android/AndroidManifest.xml.tmp
-	mv -f android/AndroidManifest.xml.tmp $@
-	sed -e "s/@ANDROID_VERSION_NAME@/$(v_name)/" <$@ >android/AndroidManifest.xml.tmp
-	mv -f android/AndroidManifest.xml.tmp $@
-
-android/build.xml: android/AndroidManifest.xml android/dummy.txt
-#	this is needed, otherwise somehow the files cant be deleted
-	mkdir -p $(builddir)/android/src/
-	if [ "$(builddir)" != "$(srcdir)" ]; then chmod -R u+w $(builddir)/android/src/; fi
-	if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf $(builddir)/android/src/; fi
-	if [ "$(builddir)" != "$(srcdir)" ]; then cp -rpf $(srcdir)/android/* $(builddir)/android; fi
-	touch $(srcdir)/android/dummy.txt
-	touch $(builddir)/android/dummy.txt
-	android update project -t @ANDROID_PROJECT@ -p android
-
-apkg-all: all android/build.xml navit.xml
-	mkdir -p android/libs/armeabi
-	cp .libs/*.so android/libs/armeabi/libnavit.so
-	for i in */*/.libs/*.so ; do sed 's&lib_data_data_org\.navitproject\.navit_lib_&/data/data/org.navitproject.navit/lib/lib&' <$$i >android/libs/armeabi/$$(basename $$i); done
-
-	for i in $(shell cd $(srcdir)/../po && echo ??_*.po.in ??.po.in); do echo Gnerating strings.xml from $$i ; mkdir -p $(builddir)/android/res/values-$$(echo $$i | sed -e s/\\.po\\.in// -e s/_/-r/) ; @SAXON@ $(srcdir)/android/res/values/strings.xml $(srcdir)/android/po2xml.xslt po_file=$(abs_top_srcdir)/po/$$i >$(builddir)/android/res/values-$$(echo $$i | sed -e s/\\.po\\.in// -e s/_/-r/)/strings.xml ; done
-
-	mkdir -p android/res/drawable-ldpi
-	mkdir -p android/res/drawable-mdpi
-	mkdir -p android/res/drawable-hdpi
-	for i in $(shell cd $(srcdir)/xpm && echo *.xpm); do convert $(srcdir)/xpm/$$i android/res/drawable-mdpi/$${i%.xpm}.png; done 
-	for i in $(shell cd $(srcdir)/xpm && echo *.xpm); do convert -resize 75% $(srcdir)/xpm/$$i android/res/drawable-ldpi/$${i%.xpm}.png; done 
-	for i in $(shell cd $(srcdir)/xpm && echo *.xpm); do convert -resize 150% $(srcdir)/xpm/$$i android/res/drawable-hdpi/$${i%.xpm}.png; done 
-
-#	for i in $(shell cd $(srcdir)/xpm && echo *.png); do cp $(srcdir)/xpm/$$i android/res/drawable-mdpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
-#	for i in $(shell cd $(srcdir)/xpm && echo *.png); do cp $(srcdir)/xpm/$$i android/res/drawable-ldpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
-#	for i in $(shell cd $(srcdir)/xpm && echo *.png); do cp $(srcdir)/xpm/$$i android/res/drawable-hdpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
-
-	for i in $(shell cd $(srcdir)/xpm && echo *.png); do convert $(srcdir)/xpm/$$i android/res/drawable-mdpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
-	for i in $(shell cd $(srcdir)/xpm && echo *.png); do convert -resize 75% $(srcdir)/xpm/$$i android/res/drawable-ldpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
-	for i in $(shell cd $(srcdir)/xpm && echo *.png); do convert -resize 150% $(srcdir)/xpm/$$i android/res/drawable-hdpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
-
-#	if [ "$(builddir)" != "$(srcdir)" ]; then for i in $(shell cd $(builddir)/xpm && echo *.png); do cp $(builddir)/xpm/$$i android/res/drawable-mdpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done ; fi
-#	if [ "$(builddir)" != "$(srcdir)" ]; then for i in $(shell cd $(builddir)/xpm && echo *.png); do cp $(builddir)/xpm/$$i android/res/drawable-ldpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done ; fi
-#	if [ "$(builddir)" != "$(srcdir)" ]; then for i in $(shell cd $(builddir)/xpm && echo *.png); do cp $(builddir)/xpm/$$i android/res/drawable-hdpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done ; fi
-
-	if [ "$(builddir)" != "$(srcdir)" ]; then for i in $(shell cd $(builddir)/xpm && echo *.png); do convert $(builddir)/xpm/$$i android/res/drawable-mdpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done ; fi
-	if [ "$(builddir)" != "$(srcdir)" ]; then for i in $(shell cd $(builddir)/xpm && echo *.png); do convert -resize 75% $(builddir)/xpm/$$i android/res/drawable-ldpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done ; fi
-	if [ "$(builddir)" != "$(srcdir)" ]; then for i in $(shell cd $(builddir)/xpm && echo *.png); do convert -resize 150% $(builddir)/xpm/$$i android/res/drawable-hdpi/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done ; fi
-
-	mkdir -p android/res/raw
-	for i in $(shell cd ../po && echo *.mo); do cp ../po/$$i android/res/raw/$$( echo $$i | tr "[A-Z]" "[a-z]") ; done
-#	cp navit.xml android/res/raw
-	cp navit_android_mdpi.xml android/res/raw/navitmdpi.xml
-	cp navit_android_ldpi.xml android/res/raw/navitldpi.xml
-	cp navit_android_hdpi.xml android/res/raw/navithdpi.xml
-
-apkg: apkg-all
-	touch $(srcdir)/android/dummy.txt
-	touch $(builddir)/android/dummy.txt
-	cd android && ant debug
-
-apkg-release: apkg-all
-	touch $(srcdir)/android/dummy.txt
-	touch $(builddir)/android/dummy.txt
-	cd android && ant release
-	jarsigner $$(cat ~/.keystore_args) android/bin/Navit-unsigned.apk mykey
-#	zipalign -f 4  android/bin/Navit-unsigned.apk android/bin/Navit-unsigned-aligned.apk
-else
-navit_SOURCES = start.c
-navit_LDADD = lib@LIBNAVIT@.la
-
-endif
-
-if EVENT_GLIB
-  lib@LIBNAVIT@_la_SOURCES += event_glib.c
-endif
-
-navit_LDFLAGS = -export-dynamic
-
-if !PLUGINS
-  lib@LIBNAVIT@_la_SOURCES += builtin.c
-  lib@LIBNAVIT@_la_LIBADD += $(MODULES)
-endif
-
-
-navit_LDADD += @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @CRYPTO_LIBS@ @INTLLIBS@
- 
-
-if SUPPORT_WIN32
-  navit_LDADD += resource.rsc
-if SUPPORT_WIN32CE
-  navit_LDADD += -lcommctrl -Lsupport/libc
-else
-  navit_LDADD += -lgdi32 -lcomctl32 -lwinmm
-endif
-
-
-resource.rsc: $(top_srcdir)/navit/gui/win32/resources/resource.rc
-	$(WINDRES) -I $(top_srcdir)/navit/gui/win32/resources $(top_srcdir)/navit/gui/win32/resources/resource.rc resource.rsc
-endif
-
-.PHONY: version.h.tmp
-
-version.h.tmp:
-	echo "#include \"config.h\"" >version.h.tmp
-if SOURCE_MODE_SVN
-	echo "#define SVN_VERSION \"$$(LANG=C svnversion $(top_srcdir) 2>/dev/null)\"" >>version.h.tmp
-else
-	echo "#define SVN_VERSION \"@SOURCE_MODE@\"" >>version.h.tmp
-endif
-	echo "#define GIT_VERSION \"$(shell git describe --abbrev=8 --dirty --always --tags)\"" >>version.h.tmp
-	echo "#define NAVIT_VARIANT \"@NAVIT_VARIANT@\"" >>version.h.tmp
-	if ! diff version.h.tmp version.h >/dev/null 2>/dev/null; \
-	then \
-		mv -f version.h.tmp version.h; \
-	fi
-
-version.h: version.h.tmp
-
-navit_config.h: ../config.h
-	cp ../config.h navit_config.h.tmp
-	if ! diff navit_config.h.tmp navit_config.h >/dev/null 2>/dev/null; \
-	then \
-		mv -f navit_config.h.tmp navit_config.h; \
-	fi
-
-
-distclean-local:
-	rm -f version.h version.h.tmp navit_config.h navit_config.h.tmp builtin.c support-builtin.c navit.xml resurce.rsc
-	if [ "$(top_builddir)" != "$(top_srcdir)" ]; then rm -f navit.dtd; fi
-
-builtin.c: $(top_builddir)/config.h
-	ls $(top_builddir)/navit/*/*/*.la | sed -e "s/\.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
-	echo "extern void builtin_init(void);" >>builtin.c
-	echo "void builtin_init(void) {" >>builtin.c
-	ls $(top_builddir)/navit/*/*/*.la | grep -v shapefile | sed -e "s/\.la/_init();/" -e "s/.*\\/lib/	module_/" >>builtin.c
-	echo "}" >>builtin.c
-support-builtin.c: $(top_builddir)/config.h
-	ls $(top_builddir)/navit/support/*/*.la | sed -e "s/\.la/_init(void);/" -e "s/.*lib/extern void module_/" >support-builtin.c
-	echo "extern void builtin_init(void);" >>support-builtin.c
-	echo "void builtin_init(void) {" >>support-builtin.c
-	ls $(top_builddir)/navit/support/*/*.la | sed -e "s/\.la/_init();/" -e "s/.*\\/lib/	module_/" >>support-builtin.c
-	echo "}" >>support-builtin.c
diff --git a/navit/autoload/Makefile.am b/navit/autoload/Makefile.am
deleted file mode 100644
index 4ca10b6fa..000000000
--- a/navit/autoload/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=
-if USE_OSSO
-    SUBDIRS += osso
-endif 
-
-DIST_SUBDIRS= osso
diff --git a/navit/autoload/osso/Makefile.am b/navit/autoload/osso/Makefile.am
deleted file mode 100644
index bb965beb3..000000000
--- a/navit/autoload/osso/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @LIBOSSO_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/navit -DMODULE=plugin_osso
-moduleautoload_LTLIBRARIES = libplugin_osso.la
-libplugin_osso_la_LDFLAGS=-module -avoid-version @NAVIT_MODULE_LDFLAGS@ @LIBOSSO_LIBS@ #-Wl,--no-undefined
-
-libplugin_osso_la_SOURCES = osso.c
diff --git a/navit/binding/Makefile.am b/navit/binding/Makefile.am
deleted file mode 100644
index 6b782b48a..000000000
--- a/navit/binding/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-SUBDIRS=
-if BINDING_PYTHON
-  SUBDIRS+=python
-endif
-if BINDING_DBUS
-  SUBDIRS+=dbus
-endif
-
-if BINDING_WIN32
-  SUBDIRS+=win32
-endif
-
-
-DIST_SUBDIRS=python dbus win32
-
diff --git a/navit/binding/dbus/Makefile.am b/navit/binding/dbus/Makefile.am
deleted file mode 100644
index 1e6334291..000000000
--- a/navit/binding/dbus/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=binding_dbus
-modulebinding_LTLIBRARIES = libbinding_dbus.la
-libbinding_dbus_la_SOURCES = binding_dbus.c
-libbinding_dbus_la_LIBADD = @DBUS_LIBS@
-libbinding_dbus_la_LDFLAGS = -module -avoid-version
-
-servicedir = @DBUS_SERVICE_DIR@
-service_in_files = org.navit_project.navit.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-
-EXTRA_DIST = $(service_in_files)
-
-distclean-local:
-	rm -f $(service_DATA)
diff --git a/navit/binding/python/Makefile.am b/navit/binding/python/Makefile.am
deleted file mode 100644
index a71632317..000000000
--- a/navit/binding/python/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @PYTHON_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=binding_python
-modulebinding_LTLIBRARIES = libbinding_python.la
-libbinding_python_la_SOURCES = binding_python.c config.c navit.c pcoord.c route.c navigation.c attr.c common.h
-libbinding_python_la_LIBADD = @PYTHON_LIBS@
-libbinding_python_la_LDFLAGS = -module -avoid-version
diff --git a/navit/binding/win32/Makefile.am b/navit/binding/win32/Makefile.am
deleted file mode 100644
index f25c28d3e..000000000
--- a/navit/binding/win32/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = -I$(top_srcdir)/navit -I$(top_srcdir)/navit/binding/win32 @NAVIT_CFLAGS@ -DMODULE=binding_win32
-if PLUGINS
-modulebinding_LTLIBRARIES = libbinding_win32.la
-else
-noinst_LTLIBRARIES = libbinding_win32.la
-endif
-libbinding_win32_la_SOURCES = binding_win32.c binding_win32.h
-libbinding_win32_la_LIBADD = 
-libbinding_win32_la_LDFLAGS = -module -avoid-version
-bin_PROGRAMS=tell_navit
-tell_navit_LDADD = @NAVIT_LIBS@
-if SUPPORT_WIN32CE
-   tell_navit_LDADD += -L$(top_builddir)/navit/support/libc -lsupport_libc
-endif
diff --git a/navit/fib-1.1/Makefile.am b/navit/fib-1.1/Makefile.am
deleted file mode 100644
index 7c7b2a130..000000000
--- a/navit/fib-1.1/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_LTLIBRARIES = libfib.la
-libfib_la_SOURCES = fib.c fib.h fibpriv.h
-EXTRA_DIST=README configure.in fh_extractmin.3 fh_makeheap.3 fh_makekeyheap.3 fibtest.c fibtest2.c tt.c use.c
diff --git a/navit/font/Makefile.am b/navit/font/Makefile.am
deleted file mode 100644
index 620280e6f..000000000
--- a/navit/font/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS=
-if FONT_FREETYPE
-  SUBDIRS+=freetype
-endif
diff --git a/navit/font/freetype/Makefile.am b/navit/font/freetype/Makefile.am
deleted file mode 100644
index 4c081e391..000000000
--- a/navit/font/freetype/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @FREETYPE2_CFLAGS@ @FONTCONFIG_CFLAGS@ @FRIBIDI2_CFLAGS@ @FRIBIDI_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=font_freetype
-if PLUGINS
-  modulefont_LTLIBRARIES = libfont_freetype.la
-else
-  noinst_LTLIBRARIES = libfont_freetype.la
-endif
-libfont_freetype_la_SOURCES = font_freetype.c font_freetype.h
-libfont_freetype_la_LDFLAGS = @FREETYPE2_LIBS@ @FONTCONFIG_LIBS@ @FRIBIDI2_LIBS@ @FRIBIDI_LIBS@ -module -avoid-version
diff --git a/navit/fonts/Makefile.am b/navit/fonts/Makefile.am
deleted file mode 100644
index d8ea2633b..000000000
--- a/navit/fonts/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-
-fonts_DATA =
-fonts_DATA += LiberationMono-Bold.ttf
-fonts_DATA += LiberationMono-BoldItalic.ttf
-fonts_DATA += LiberationMono-Italic.ttf
-fonts_DATA += LiberationMono-Regular.ttf
-fonts_DATA += LiberationSans-Bold.ttf
-fonts_DATA += LiberationSans-BoldItalic.ttf
-fonts_DATA += LiberationSans-Italic.ttf
-fonts_DATA += LiberationSans-Regular.ttf
-fonts_DATA += LiberationSerif-Bold.ttf
-fonts_DATA += LiberationSerif-BoldItalic.ttf
-fonts_DATA += LiberationSerif-Italic.ttf
-fonts_DATA += LiberationSerif-Regular.ttf
diff --git a/navit/graphics/Makefile.am b/navit/graphics/Makefile.am
deleted file mode 100644
index c878b9a35..000000000
--- a/navit/graphics/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-SUBDIRS=
-if GRAPHICS_ANDROID
-  SUBDIRS+=android
-endif
-if GRAPHICS_GTK_DRAWING_AREA
-  SUBDIRS+=gtk_drawing_area
-endif
-if GRAPHICS_NULL
-  SUBDIRS+=null
-endif
-if GRAPHICS_OPENGL
-  SUBDIRS+=opengl
-endif
-if GRAPHICS_QT_QPAINTER
-  SUBDIRS+=qt_qpainter
-endif
-if GRAPHICS_SDL
-  SUBDIRS+=sdl
-endif
-if GRAPHICS_WIN32
-  SUBDIRS+=win32
-endif
-if GRAPHICS_GD
-  SUBDIRS+=gd
-endif
diff --git a/navit/graphics/android/Makefile.am b/navit/graphics/android/Makefile.am
deleted file mode 100644
index a625edd1c..000000000
--- a/navit/graphics/android/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_android
-if PLUGINS
-modulegraphics_LTLIBRARIES = libgraphics_android.la
-else
-noinst_LTLIBRARIES = libgraphics_android.la
-endif
-libgraphics_android_la_SOURCES = graphics_android.c
-libgraphics_android_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/graphics/gd/Makefile.am b/navit/graphics/gd/Makefile.am
deleted file mode 100644
index 67fc270ac..000000000
--- a/navit/graphics/gd/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @GD_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/navit -DMODULE=graphics_gd
-libgraphics_gd_la_LDFLAGS = @GD_LIBS@ -module -avoid-version
-if PLUGINS
-modulegraphics_LTLIBRARIES = libgraphics_gd.la
-else
-noinst_LTLIBRARIES = libgraphics_gd.la
-endif
-libgraphics_gd_la_SOURCES = graphics_gd.c
diff --git a/navit/graphics/gtk_drawing_area/Makefile.am b/navit/graphics/gtk_drawing_area/Makefile.am
deleted file mode 100644
index 79da228d7..000000000
--- a/navit/graphics/gtk_drawing_area/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @GTK2_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/navit -DMODULE=graphics_gtk_drawing_area
-modulegraphics_LTLIBRARIES = libgraphics_gtk_drawing_area.la
-libgraphics_gtk_drawing_area_la_SOURCES = graphics_gtk_drawing_area.c
-libgraphics_gtk_drawing_area_la_LDFLAGS = @GTK2_LIBS@ @IMLIB2_LIBS@ -module -avoid-version
diff --git a/navit/graphics/null/Makefile.am b/navit/graphics/null/Makefile.am
deleted file mode 100644
index a4631ff4a..000000000
--- a/navit/graphics/null/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_null
-if PLUGINS
-modulegraphics_LTLIBRARIES = libgraphics_null.la
-else
-noinst_LTLIBRARIES = libgraphics_null.la
-endif
-libgraphics_null_la_SOURCES = graphics_null.c
-libgraphics_null_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/graphics/opengl/Makefile.am b/navit/graphics/opengl/Makefile.am
deleted file mode 100644
index 02d356dd7..000000000
--- a/navit/graphics/opengl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @OPENGL_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_opengl
-modulegraphics_LTLIBRARIES = libgraphics_opengl.la
-libgraphics_opengl_la_SOURCES = graphics_opengl.c
-libgraphics_opengl_la_LIBADD = @OPENGL_LIBS@ @GLC_LIBS@
-libgraphics_opengl_la_LDFLAGS = -module -avoid-version
diff --git a/navit/graphics/qt_qpainter/Makefile.am b/navit/graphics/qt_qpainter/Makefile.am
deleted file mode 100644
index 8c55917c7..000000000
--- a/navit/graphics/qt_qpainter/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @QT_GUI_CFLAGS@ @QT_SVG_CFLAGS@ @NAVIT_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/navit -I$(top_srcdir)/navit/graphics/qt_qpainter -DMODULE=graphics_qt_qpainter
-modulegraphics_LTLIBRARIES = libgraphics_qt_qpainter.la
-libgraphics_qt_qpainter_la_SOURCES = graphics_qt_qpainter.cpp graphics_qt_qpainter.h RenderArea.cpp RenderArea.h RenderArea.moc
-libgraphics_qt_qpainter_la_LDFLAGS = @QT_GUI_LIBS@ @QT_SVG_LIBS@ -module -avoid-version
-if GRAPHICS_QT_QPAINTER
-BUILT_SOURCES = RenderArea.moc
-RenderArea.moc:
-	@MOC@ $(srcdir)/RenderArea.h >RenderArea.moc || touch RenderArea.moc
-
-distclean-local:
-	$(RM) RenderArea.moc
-endif
diff --git a/navit/graphics/sdl/Makefile.am b/navit/graphics/sdl/Makefile.am
deleted file mode 100644
index 1c9b4056d..000000000
--- a/navit/graphics/sdl/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @SDL_CFLAGS@ @FREETYPE2_CFLAGS@ @LIBPDL_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_sdl
-modulegraphics_LTLIBRARIES = libgraphics_sdl.la
-libgraphics_sdl_la_SOURCES = graphics_sdl.c raster.c raster.h
-libgraphics_sdl_la_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @FREETYPE2_LIBS@ @LIBPDL_LIBS@ -module -avoid-version
diff --git a/navit/graphics/win32/Makefile.am b/navit/graphics/win32/Makefile.am
deleted file mode 100644
index 15ec2441c..000000000
--- a/navit/graphics/win32/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=graphics_win32
-libgraphics_win32_la_SOURCES = graphics_win32.c xpm2bmp.c
-libgraphics_win32_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
-if !SUPPORT_WIN32CE
-libgraphics_win32_la_LDFLAGS += -Wl,-lgdi32
-endif
-if PLUGINS
-modulegraphics_LTLIBRARIES = libgraphics_win32.la
-else
-noinst_LTLIBRARIES = libgraphics_win32.la
-endif
diff --git a/navit/gui/Makefile.am b/navit/gui/Makefile.am
deleted file mode 100644
index 10086b5a1..000000000
--- a/navit/gui/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS=
-if GUI_INTERNAL
-  SUBDIRS += internal
-endif
-if GUI_GTK
-  SUBDIRS += gtk
-endif
-if GUI_WIN32
-  SUBDIRS += win32
-endif
-if GUI_QML
-  SUBDIRS += qml
-endif
\ No newline at end of file
diff --git a/navit/gui/gtk/Makefile.am b/navit/gui/gtk/Makefile.am
deleted file mode 100644
index ddcfc2ae3..000000000
--- a/navit/gui/gtk/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @HILDON_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=gui_gtk
-modulegui_LTLIBRARIES = libgui_gtk.la
-libgui_gtk_la_SOURCES = datawindow.c destination.c gui_gtk_statusbar.c gui_gtk_action.c gui_gtk_window.c gui_gtk_poi.c gui_gtk.h gui_gtk_poi.h
-libgui_gtk_la_LIBADD = @GTK2_LIBS@
-libgui_gtk_la_LDFLAGS = -module -avoid-version
diff --git a/navit/gui/internal/Makefile.am b/navit/gui/internal/Makefile.am
deleted file mode 100644
index ed819ce4e..000000000
--- a/navit/gui/internal/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/navit -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ -DMODULE=gui_internal
-if PLUGINS
-modulegui_LTLIBRARIES = libgui_internal.la
-else
-noinst_LTLIBRARIES = libgui_internal.la
-endif
-libgui_internal_la_SOURCES = gui_internal_bookmark.c gui_internal.c gui_internal_command.c gui_internal_gesture.c gui_internal_html.c gui_internal_keyboard.c gui_internal_menu.c gui_internal_poi.c gui_internal_search.c gui_internal_widget.c gui_internal_bookmark.h gui_internal_command.h gui_internal_gesture.h gui_internal.h gui_internal_html.h gui_internal_keyboard.h gui_internal_menu.h gui_internal_poi.h gui_internal_priv.h gui_internal_search.h gui_internal_widget.h
-libgui_internal_la_LIBADD = 
-libgui_internal_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/gui/qml/Makefile.am b/navit/gui/qml/Makefile.am
deleted file mode 100644
index a52b399b2..000000000
--- a/navit/gui/qml/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @QT_DECLARATIVE_CFLAGS@ @QT_GUI_CFLAGS@ @QT_XML_CFLAGS@ @NAVIT_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/navit -DMODULE=gui_qml
-modulegui_LTLIBRARIES = libgui_qml.la
-libgui_qml_la_SOURCES = proxy.moc proxy.h ngqpoint.moc ngqpoint.h searchProxy.moc routeProxy.h searchProxy.h bookmarksProxy.moc bookmarksProxy.h vehicleProxy.moc vehicleProxy.h navitProxy.moc navitProxy.h guiProxy.moc guiProxy.h gui_qml.moc gui_qml.cpp
-libgui_qml_la_LDFLAGS = @QT_DECLARATIVE_LIBS@ @QT_GUI_LIBS@ @QT_XML_LIBS@ -module -avoid-version
-BUILT_SOURCES = gui_qml.moc proxy.moc ngqpoint.moc routeProxy.moc searchProxy.moc bookmarksProxy.moc vehicleProxy.moc navitProxy.moc guiProxy.moc
-%.moc: %.h
-	@MOC@ $(srcdir)/$< > $@ || touch $@
-%.moc: %.cpp
-	@MOC@ $(srcdir)/$< > $@ || touch $@
-distclean-local:
-	-$(RM) *.moc
-
-SUBDIRS=skins
diff --git a/navit/gui/qml/skins/Makefile.am b/navit/gui/qml/skins/Makefile.am
deleted file mode 100644
index e0f29a206..000000000
--- a/navit/gui/qml/skins/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS=navit
\ No newline at end of file
diff --git a/navit/gui/qml/skins/navit/Makefile.am b/navit/gui/qml/skins/navit/Makefile.am
deleted file mode 100644
index 0842a330c..000000000
--- a/navit/gui/qml/skins/navit/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-
-SKIN = navit
-
-qmldir=$(skinsdir)/$(SKIN)
-
-qml_DATA = ButtonIcon.qml ToggleSwitch.qml ToggleButton.qml ListSelector.qml Slider.qml CommonHighlight.qml Cellar.qml main.qml PageMain.qml PageNavigate.qml PageAbout.qml PageBookmarksAdd.qml PageBookmarks.qml PageRoute.qml PageSearch.qml PageSearchSelector.qml PageSettingsDisplay.qml PageSettingsLocale.qml PageSettings.qml PageSettingsRules.qml PageSettingsTools.qml PageSettingsVehicle.qml PagePoi.qml PagePointInfo.qml
-qml_DATA += background.svg knob.svg
-qml_DATA += command.js pagenavigation.js
diff --git a/navit/gui/win32/Makefile.am b/navit/gui/win32/Makefile.am
deleted file mode 100644
index 06d91fac6..000000000
--- a/navit/gui/win32/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = -I$(top_srcdir)/navit -I$(top_srcdir)/navit/graphics/win32 @NAVIT_CFLAGS@ -DMODULE=gui_win32
-if PLUGINS
-modulegui_LTLIBRARIES = libgui_win32.la
-else
-noinst_LTLIBRARIES = libgui_win32.la
-endif
-libgui_win32_la_SOURCES = gui_win32.c win32_gui_destination.c win32_gui_notify.c ceglue.h ceglue.c
-libgui_win32_la_LIBADD = 
-libgui_win32_la_LDFLAGS = -module -avoid-version
diff --git a/navit/map/Makefile.am b/navit/map/Makefile.am
deleted file mode 100644
index d2b6efdc5..000000000
--- a/navit/map/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-SUBDIRS=
-if MAP_BINFILE
-  SUBDIRS+=binfile
-endif
-if MAP_FILTER
-  SUBDIRS+=filter
-endif
-if HAVELIBGARMIN
-  SUBDIRS+=garmin
-endif
-if MAP_MG
-  SUBDIRS+=mg
-endif
-if MAP_SHAPEFILE
-  SUBDIRS+=shapefile
-endif
-if MAP_TEXTFILE
-  SUBDIRS+=textfile
-endif
-if MAP_CSV
-  SUBDIRS+=csv
-endif
-
-DIST_SUBDIRS=mg textfile csv binfile garmin shapefile filter
diff --git a/navit/map/binfile/Makefile.am b/navit/map/binfile/Makefile.am
deleted file mode 100644
index 6bf671175..000000000
--- a/navit/map/binfile/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_binfile
-if PLUGINS
-  modulemap_LTLIBRARIES = libmap_binfile.la
-else
-  noinst_LTLIBRARIES = libmap_binfile.la
-endif
-libmap_binfile_la_SOURCES = binfile.c
-libmap_binfile_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/map/csv/Makefile.am b/navit/map/csv/Makefile.am
deleted file mode 100644
index d8670ea2c..000000000
--- a/navit/map/csv/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_csv
-if PLUGINS
-  modulemap_LTLIBRARIES = libmap_csv.la
-else
-  noinst_LTLIBRARIES = libmap_csv.la
-endif
-libmap_csv_la_SOURCES = csv.c csv.h quadtree.c quadtree.h
-libmap_csv_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/map/filter/Makefile.am b/navit/map/filter/Makefile.am
deleted file mode 100644
index 3bd14e8bf..000000000
--- a/navit/map/filter/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_filter
-if PLUGINS
-  modulemap_LTLIBRARIES = libmap_filter.la
-else
-  noinst_LTLIBRARIES = libmap_filter.la
-endif
-libmap_filter_la_SOURCES = filter.c
-libmap_filter_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/map/garmin/Makefile.am b/navit/map/garmin/Makefile.am
deleted file mode 100644
index 8fa224fc1..000000000
--- a/navit/map/garmin/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@   -I$(top_srcdir)/navit -DMODULE=map_garmin
-AM_CPPFLAGS+= @LIBGARMIN_CFLAGS@
-INCLUDES=-I$(top_srcdir)/navit/map/garmin/libgarmin
-AM_CPPFLAGS+=-I$(top_srcdir)/navit/map/garmin/libgarmin
-AM_CPPFLAGS+=-I$(srcdir)
-
-modulemap_LTLIBRARIES = libmap_garmin.la
-libmap_garmin_la_SOURCES = garmin.c garmin.h gar2navit.c gar2navit.h
-libmap_garmin_la_LIBADD = @LIBGARMIN_LIBS@
-libmap_garmin_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
-nodist_libmap_garmin_la_SOURCES = g2nbuiltin.h
-builddir = @builddir@
-
-gar2navit.l$(OBJEXT): g2nbuiltin.h
-
-CLEANFILES = g2nbuiltin.h
-
-noinst_PROGRAMS=gentypes$(EXEEXT)
-gentypes_SOURCES=gentypes.c
-
-gentypes.$(OBJEXT): gentypes.c
-	$(CC_FOR_BUILD) -I$(top_srcdir)/navit -I$(top_srcdir) -c -o $@ $<
-
-gentypes$(EXEEXT): $(gentypes_OBJECTS) $(gentypes_DEPENDENCIES) 
-	@rm -f gentypes$(EXEEXT)
-	$(CCLD_FOR_BUILD) -o $@ $(gentypes_OBJECTS)
-
-g2nbuiltin.h: gentypes$(EXEEXT) garmintypes.txt
-	./gentypes$(EXEEXT) $(top_srcdir)/navit/map/garmin/garmintypes.txt $@
-
-EXTRA_DIST = garmintypes.txt
-
diff --git a/navit/map/garmin_img/Makefile.am b/navit/map/garmin_img/Makefile.am
deleted file mode 100644
index dbbcd9b55..000000000
--- a/navit/map/garmin_img/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_garmin_img
-modulemap_LTLIBRARIES = libmap_garmin_img.la
-libmap_garmin_img_la_SOURCES = garmin_img.c
-libmap_garmin_img_la_LDFLAGS = -module -avoid-version
diff --git a/navit/map/mg/Makefile.am b/navit/map/mg/Makefile.am
deleted file mode 100644
index ee05be835..000000000
--- a/navit/map/mg/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_mg
-if PLUGINS
-  modulemap_LTLIBRARIES = libmap_mg.la
-else
-  noinst_LTLIBRARIES = libmap_mg.la
-endif
-libmap_mg_la_SOURCES = map.c block.c town.c tree.c poly.c street.c mg.h
-libmap_mg_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/map/shapefile/Makefile.am b/navit/map/shapefile/Makefile.am
deleted file mode 100644
index f23fb8278..000000000
--- a/navit/map/shapefile/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @SHAPEFILE_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_shapefile
-if PLUGINS
-  modulemap_LTLIBRARIES = libmap_shapefile.la
-else
-  noinst_LTLIBRARIES = libmap_shapefile.la
-endif
-libmap_shapefile_la_SOURCES = shapefile.c
-libmap_shapefile_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
-if HAVE_SYSTEM_SHAPEFILELIB
-libmap_shapefile_la_LIBADD = @SHAPEFILE_LIBS@
-else
-libmap_shapefile_la_LIBADD = $(top_builddir)/navit/support/shapefile/libsupport_shapefile.la
-endif
diff --git a/navit/map/textfile/Makefile.am b/navit/map/textfile/Makefile.am
deleted file mode 100644
index b3190e7f7..000000000
--- a/navit/map/textfile/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_textfile
-if PLUGINS
-  modulemap_LTLIBRARIES = libmap_textfile.la
-else
-  noinst_LTLIBRARIES = libmap_textfile.la
-endif
-libmap_textfile_la_SOURCES = textfile.c textfile.h
-libmap_textfile_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/maps/Makefile.am b/navit/maps/Makefile.am
deleted file mode 100644
index 798ca6d5c..000000000
--- a/navit/maps/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-
-.SECONDARY:
-
-SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2
-
-maptool_args=--attr-debug-level=5
-maptool=$(top_builddir)/navit/maptool/maptool
-
-maps_DATA = $(SAMPLE_MAP).bin $(SAMPLE_MAP).xml
-
-SUFFIXES=.osm.bz2 .osm.pbf .txt .shp .osm
-
-samplemap: $(SAMPLE_MAP).bin
-
-.osm.bin:
-	echo "Converting osm map"
-	$(maptool) $(maptool_args) $@.tmp <$<
-	mv $@.tmp $@
-
-.txt.bin:
-	$(maptool) $(maptool_args) $@.tmp -p $(top_builddir)/navit/map/textfile/libmap_textfile.la -m "type=textfile data="$<
-	mv $@.tmp $@
-
-.shp.bin:
-	$(maptool) $(maptool_args) $@.tmp -p $(top_builddir)/navit/map/shapefile/libmap_shapefile.la -m "type=shapefile data=$(subst .shp,,$<) $(SHAPEFILE_ATTRIBUTES)"
-	mv $@.tmp $@
-
-.osm.bz2.bin:
-	echo "Converting osm map"
-	bzcat $< | $(maptool) $(maptool_args) $@.tmp
-	mv $@.tmp $@
-
-.osm.pbf.bin:
-	echo "Converting osm map"
-	$(maptool) --protobuf $(maptool_args) $@.tmp <$<
-	mv $@.tmp $@
-
-.bin.xml:
-	echo '<map type="binfile" enabled="yes" data="$$NAVIT_SHAREDIR/maps/$<"/>' >$@
-
-	
-$(SAMPLE_MAP).osm.bz2:
-	echo "Downloading osm sample map"
-	wget -O $(SAMPLE_MAP).osm.bz2.tmp http://www.navit-project.org/maps/$(SAMPLE_MAP).osm.bz2
-	mv $(SAMPLE_MAP).osm.bz2.tmp $(SAMPLE_MAP).osm.bz2
-
-distclean-local: 
-	rm -f $(SAMPLE_MAP).osm.bz2 $(SAMPLE_MAP).bin $(SAMPLE_MAP).xml
-
-all:
diff --git a/navit/maptool/Makefile.am b/navit/maptool/Makefile.am
deleted file mode 100644
index 95454a058..000000000
--- a/navit/maptool/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-if !SUPPORT_ANDROID
-  bin_PROGRAMS = maptool
-  noinst_LTLIBRARIES        = libmaptool.la
-endif
-
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit @ZLIB_CFLAGS@ @POSTGRESQL_CFLAGS@ -DMODULE=maptool
-libmaptool_la_SOURCES = boundaries.c buffer.c ch.c coastline.c itembin.c itembin_buffer.c misc.c osm.c osm_o5m.c osm_psql.c osm_protobuf.c osm_protobufdb.c osm_relations.c osm_xml.c sourcesink.c tempfile.c tile.c zip.c maptool.h generated-code/fileformat.pb-c.c generated-code/fileformat.pb-c.h generated-code/osmformat.pb-c.c generated-code/osmformat.pb-c.h google/protobuf-c/protobuf-c.c google/protobuf-c/protobuf-c.h google/protobuf-c/protobuf-c-private.h
-maptool_SOURCES = maptool.c
-maptool_LDADD = libmaptool.la ../libnavit.la @NAVIT_LIBS@ @WORDEXP_LIBS@ @ZLIB_LIBS@ @POSTGRESQL_LIBS@ @CRYPTO_LIBS@ @INTLLIBS@ @LIBC_LIBS@
diff --git a/navit/osd/Makefile.am b/navit/osd/Makefile.am
deleted file mode 100644
index f14eff62d..000000000
--- a/navit/osd/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=
-DIST_SUBDIRS=core
-
-if OSD_CORE
-  SUBDIRS+=core
-endif
diff --git a/navit/osd/core/Makefile.am b/navit/osd/core/Makefile.am
deleted file mode 100644
index 10f17f8d2..000000000
--- a/navit/osd/core/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=osd_core
-if PLUGINS
-  moduleosd_LTLIBRARIES = libosd_core.la
-else
-  noinst_LTLIBRARIES = libosd_core.la
-endif
-libosd_core_la_SOURCES = osd_core.c
-libosd_core_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
-
diff --git a/navit/plugin/Makefile.am b/navit/plugin/Makefile.am
deleted file mode 100644
index da51c76af..000000000
--- a/navit/plugin/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS=
-if PLUGIN_PEDESTRIAN
-  SUBDIRS += pedestrian
-endif
-
-DIST_SUBDIRS=pedestrian
diff --git a/navit/plugin/pedestrian/Makefile.am b/navit/plugin/pedestrian/Makefile.am
deleted file mode 100644
index 9427f44d5..000000000
--- a/navit/plugin/pedestrian/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/navit -DMODULE=plugin_pedestrian
-moduleplugin_LTLIBRARIES = libplugin_pedestrian.la
-libplugin_pedestrian_la_LDFLAGS=-module -avoid-version @NAVIT_MODULE_LDFLAGS@ #-Wl,--no-undefined
-
-libplugin_pedestrian_la_SOURCES = pedestrian.c
-
-android: libplugin_pedestrian.la
-	cp .libs/libplugin_pedestrian.so ../../android/libs/armeabi
-xslt:
-	cp *.xslt ../../xslt
diff --git a/navit/speech/Makefile.am b/navit/speech/Makefile.am
deleted file mode 100644
index 3c232db0b..000000000
--- a/navit/speech/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS=
-if SPEECH_ANDROID
-  SUBDIRS += android
-endif
-if SPEECH_CMDLINE
-  SUBDIRS += cmdline
-endif
-if SPEECH_DBUS
-  SUBDIRS += dbus
-endif
-if SPEECH_ESPEAK
-  SUBDIRS += espeak
-endif
-if SPEECH_SPEECH_DISPATCHER
-  SUBDIRS += speech_dispatcher
-endif
diff --git a/navit/speech/android/Makefile.am b/navit/speech/android/Makefile.am
deleted file mode 100644
index c2a0dc350..000000000
--- a/navit/speech/android/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_android
-if PLUGINS
-modulespeech_LTLIBRARIES = libspeech_android.la
-else
-noinst_LTLIBRARIES = libspeech_android.la
-endif
-libspeech_android_la_SOURCES = speech_android.c
-libspeech_android_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
-
-
-android: libspeech_android.la
-	mkdir -p ../../android/libs/armeabi/navit/speech
-	cp .libs/libspeech_android.so ../../android/libs/armeabi
-
-push: libspeech_android.la
-	adb push .libs/libspeech_android.so /data/data/org.navitproject.navit/lib
diff --git a/navit/speech/cmdline/Makefile.am b/navit/speech/cmdline/Makefile.am
deleted file mode 100644
index 4597bd934..000000000
--- a/navit/speech/cmdline/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_cmdline
-if PLUGINS
-modulespeech_LTLIBRARIES = libspeech_cmdline.la
-else
-noinst_LTLIBRARIES = libspeech_cmdline.la
-endif
-libspeech_cmdline_la_SOURCES = speech_cmdline.c
-libspeech_cmdline_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/speech/dbus/Makefile.am b/navit/speech/dbus/Makefile.am
deleted file mode 100644
index abe285b15..000000000
--- a/navit/speech/dbus/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_dbus
-modulespeech_LTLIBRARIES = libspeech_dbus.la
-libspeech_dbus_la_SOURCES = speech_dbus.c
-libspeech_dbus_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/speech/espeak/Makefile.am b/navit/speech/espeak/Makefile.am
deleted file mode 100644
index ecdb50324..000000000
--- a/navit/speech/espeak/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_espeak
-if PLUGINS
-modulespeech_LTLIBRARIES = libspeech_espeak.la
-else
-noinst_LTLIBRARIES = libspeech_espeak.la
-endif
-libspeech_espeak_la_SOURCES = speak.c 
-libspeech_espeak_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@ -L$(top_builddir)/navit/support/espeak -lsupport_espeak
-if !SUPPORT_WIN32CE
-libspeech_espeak_la_LDFLAGS += -Wl,-lwinmm
-endif
-
diff --git a/navit/speech/speech_dispatcher/Makefile.am b/navit/speech/speech_dispatcher/Makefile.am
deleted file mode 100644
index a040740ef..000000000
--- a/navit/speech/speech_dispatcher/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_speech_dispatcher
-modulespeech_LTLIBRARIES = libspeech_speech_dispatcher.la
-libspeech_speech_dispatcher_la_SOURCES = speech_speech_dispatcher.c
-libspeech_speech_dispatcher_la_LIBADD = @SPEECHD_LIBS@
-libspeech_speech_dispatcher_la_LDFLAGS = -module -avoid-version
diff --git a/navit/support/Makefile.am b/navit/support/Makefile.am
deleted file mode 100644
index 9f63840a1..000000000
--- a/navit/support/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-SUBDIRS=
-if SUPPORT_ESPEAK
-  SUBDIRS+=espeak
-endif
-if SUPPORT_EZXML
-  SUBDIRS+=ezxml
-endif
-if SUPPORT_GLIB
-  SUBDIRS+=glib
-endif
-if SUPPORT_WORDEXP
-  SUBDIRS+=wordexp
-endif
-if SUPPORT_WIN32
-  SUBDIRS+=win32
-endif
-if SUPPORT_ZLIB
-  SUBDIRS+=zlib
-endif
-if SUPPORT_LIBC
- SUBDIRS+=libc
-endif
-if SUPPORT_LIBPNG
- SUBDIRS+=libpng
-endif
-if SPEECH_ESPEAK
- SUBDIRS+=espeak
-endif
-if !HAVE_SYSTEM_SHAPEFILELIB
- SUBDIRS+=shapefile
-endif
-DIST_SUBDIRS=espeak ezxml glib wordexp win32 zlib libc libpng shapefile
diff --git a/navit/support/espeak/Makefile.am b/navit/support/espeak/Makefile.am
deleted file mode 100755
index 3de91b41f..000000000
--- a/navit/support/espeak/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -DMODULE=support_espeak
-noinst_LTLIBRARIES = libsupport_espeak.la
-libsupport_espeak_la_SOURCES = compiledict.c dictionary.c intonation.c \
-	readclause.c setlengths.c numbers.c synth_mbrola.c \
-	synthdata.c synthesize.c translate.c \
-	tr_languages.c voices.c wavegen.c phonemelist.c klatt.c speak_init.c
-libsupport_espeak_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
-
-#bin_PROGRAMS = speak
-
-#speak_SOURCES = speak.c $(libsupport_espeak_la_SOURCES)
-
-nobase_pkgdata_DATA  = espeak-data/af_dict espeak-data/ca_dict espeak-data/config espeak-data/cs_dict espeak-data/cy_dict
-nobase_pkgdata_DATA += espeak-data/da_dict espeak-data/de_dict espeak-data/el_dict espeak-data/en_dict espeak-data/eo_dict
-nobase_pkgdata_DATA += espeak-data/es_dict espeak-data/fi_dict espeak-data/fr_dict espeak-data/grc_dict espeak-data/hbs_dict
-nobase_pkgdata_DATA += espeak-data/hi_dict espeak-data/hu_dict espeak-data/hy_dict espeak-data/id_dict espeak-data/is_dict
-nobase_pkgdata_DATA += espeak-data/it_dict espeak-data/jbo_dict espeak-data/ku_dict espeak-data/la_dict espeak-data/lv_dict
-nobase_pkgdata_DATA += espeak-data/mk_dict espeak-data/nl_dict espeak-data/no_dict
-nobase_pkgdata_DATA += espeak-data/pap_dict espeak-data/phondata espeak-data/phondata-manifest espeak-data/phonindex
-nobase_pkgdata_DATA += espeak-data/phontab espeak-data/pl_dict espeak-data/pt_dict espeak-data/ro_dict espeak-data/ru_dict
-nobase_pkgdata_DATA += espeak-data/sk_dict espeak-data/sq_dict espeak-data/sv_dict espeak-data/sw_dict espeak-data/ta_dict
-nobase_pkgdata_DATA += espeak-data/tr_dict espeak-data/vi_dict espeak-data/voices/!v/croak espeak-data/voices/!v/f1
-nobase_pkgdata_DATA += espeak-data/voices/!v/f2 espeak-data/voices/!v/f3 espeak-data/voices/!v/f4 espeak-data/voices/!v/fast
-nobase_pkgdata_DATA += espeak-data/voices/!v/m1 espeak-data/voices/!v/m2 espeak-data/voices/!v/m3 espeak-data/voices/!v/m4
-nobase_pkgdata_DATA += espeak-data/voices/!v/m5 espeak-data/voices/!v/m6 espeak-data/voices/!v/m7 espeak-data/voices/!v/whisper
-nobase_pkgdata_DATA += espeak-data/voices/af espeak-data/voices/bs espeak-data/voices/ca espeak-data/voices/cs
-nobase_pkgdata_DATA += espeak-data/voices/cy espeak-data/voices/da espeak-data/voices/de espeak-data/voices/default
-nobase_pkgdata_DATA += espeak-data/voices/el espeak-data/voices/en/en espeak-data/voices/en/en-n espeak-data/voices/en/en-rp
-nobase_pkgdata_DATA += espeak-data/voices/en/en-sc espeak-data/voices/en/en-us espeak-data/voices/en/en-wi
-nobase_pkgdata_DATA += espeak-data/voices/en/en-wm espeak-data/voices/eo espeak-data/voices/es espeak-data/voices/es-la
-nobase_pkgdata_DATA += espeak-data/voices/fi espeak-data/voices/fr espeak-data/voices/fr-be espeak-data/voices/hi
-nobase_pkgdata_DATA += espeak-data/voices/hr espeak-data/voices/hu espeak-data/voices/hy espeak-data/voices/hy-west
-nobase_pkgdata_DATA += espeak-data/voices/id espeak-data/voices/is espeak-data/voices/it espeak-data/voices/ku
-nobase_pkgdata_DATA += espeak-data/voices/la espeak-data/voices/lv 
-nobase_pkgdata_DATA += espeak-data/voices/mk espeak-data/voices/nl espeak-data/voices/no espeak-data/voices/pl
-nobase_pkgdata_DATA += espeak-data/voices/pt espeak-data/voices/pt-pt espeak-data/voices/ro espeak-data/voices/ru
-nobase_pkgdata_DATA += espeak-data/voices/sk espeak-data/voices/sq espeak-data/voices/sr espeak-data/voices/sv
-nobase_pkgdata_DATA += espeak-data/voices/sw espeak-data/voices/ta espeak-data/voices/test/grc espeak-data/voices/test/jbo
-nobase_pkgdata_DATA += espeak-data/voices/test/pap espeak-data/voices/tr espeak-data/voices/vi espeak-data/voices/zh 
-nobase_pkgdata_DATA += espeak-data/voices/zh-yue espeak-data/zh_dict espeak-data/zhy_dict
-
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/af1_phtrans espeak-data/mbrola_ph/ca1_phtrans espeak-data/mbrola_ph/cr1_phtrans
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/cs_phtrans espeak-data/mbrola_ph/de2_phtrans espeak-data/mbrola_ph/de4_phtrans
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/de6_phtrans espeak-data/mbrola_ph/en1_phtrans espeak-data/mbrola_ph/es_phtrans
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/fr1_phtrans espeak-data/mbrola_ph/gr2_phtrans espeak-data/mbrola_ph/grc-de6_phtrans
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/hu1_phtrans espeak-data/mbrola_ph/id1_phtrans espeak-data/mbrola_ph/in1_phtrans
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/it3_phtrans espeak-data/mbrola_ph/la1_phtrans espeak-data/mbrola_ph/nl_phtrans
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/pl1_phtrans espeak-data/mbrola_ph/pt1_phtrans espeak-data/mbrola_ph/pt_phtrans
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/ptbr4_phtrans espeak-data/mbrola_ph/ptbr_phtrans espeak-data/mbrola_ph/ro1_phtrans
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/sv2_phtrans espeak-data/mbrola_ph/sv_phtrans espeak-data/mbrola_ph/us3_phtrans
-#nobase_pkgdata_DATA += espeak-data/mbrola_ph/us_phtrans
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-af1 espeak-data/voices/mb/mb-af1-en
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-br1 espeak-data/voices/mb/mb-br3 espeak-data/voices/mb/mb-br4
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-cr1 espeak-data/voices/mb/mb-cz2 espeak-data/voices/mb/mb-de2
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-de4 espeak-data/voices/mb/mb-de4-en espeak-data/voices/mb/mb-de5
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-de5-en espeak-data/voices/mb/mb-de6 espeak-data/voices/mb/mb-de6-grc
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-de7 espeak-data/voices/mb/mb-en1 espeak-data/voices/mb/mb-es1
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-es2 espeak-data/voices/mb/mb-fr1 espeak-data/voices/mb/mb-fr1-en
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-fr4 espeak-data/voices/mb/mb-fr4-en espeak-data/voices/mb/mb-gr2
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-gr2-en espeak-data/voices/mb/mb-hu1 espeak-data/voices/mb/mb-hu1-en
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-id1 espeak-data/voices/mb/mb-it3 espeak-data/voices/mb/mb-it4
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-la1 espeak-data/voices/mb/mb-nl2 espeak-data/voices/mb/mb-nl2-en
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-pl1 espeak-data/voices/mb/mb-pl1-en espeak-data/voices/mb/mb-pt1
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-ro1 espeak-data/voices/mb/mb-ro1-en espeak-data/voices/mb/mb-sw1
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-sw1-en espeak-data/voices/mb/mb-sw2 espeak-data/voices/mb/mb-sw2-en
-#nobase_pkgdata_DATA += espeak-data/voices/mb/mb-us1 espeak-data/voices/mb/mb-us2 espeak-data/voices/mb/mb-us3
diff --git a/navit/support/ezxml/Makefile.am b/navit/support/ezxml/Makefile.am
deleted file mode 100644
index 1b091a397..000000000
--- a/navit/support/ezxml/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=support_ezxml -DEZXML_NOMMAP
-noinst_LTLIBRARIES = libsupport_ezxml.la
-libsupport_ezxml_la_SOURCES = ezxml.c ezxml_init.c ezxml.h
diff --git a/navit/support/gettext_intl/Makefile.in b/navit/support/gettext_intl/Makefile.in
deleted file mode 100644
index 05f15329e..000000000
--- a/navit/support/gettext_intl/Makefile.in
+++ /dev/null
@@ -1,493 +0,0 @@
-# Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = $(srcdir)
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-transform = @program_transform_name@
-libdir = @libdir@
-includedir = @includedir@
-datadir = @datadir@
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/intl
-aliaspath = $(localedir)
-subdir = intl
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-
-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
-
-AR = ar
-CC = @CC@
-LIBTOOL = @LIBTOOL@
-RANLIB = @RANLIB@
-YACC = @INTLBISON@ -y -d
-YFLAGS = --name-prefix=__gettext
-
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
--Dset_relocation_prefix=libintl_set_relocation_prefix \
--Drelocate=libintl_relocate \
--DDEPENDS_ON_LIBICONV=1 @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = \
-  gmo.h \
-  gettextP.h \
-  hash-string.h \
-  loadinfo.h \
-  plural-exp.h \
-  eval-plural.h \
-  localcharset.h \
-  relocatable.h \
-  xsize.h \
-  printf-args.h printf-args.c \
-  printf-parse.h wprintf-parse.h printf-parse.c \
-  vasnprintf.h vasnwprintf.h vasnprintf.c \
-  os2compat.h \
-  libgnuintl.h.in
-SOURCES = \
-  bindtextdom.c \
-  dcgettext.c \
-  dgettext.c \
-  gettext.c \
-  finddomain.c \
-  loadmsgcat.c \
-  localealias.c \
-  textdomain.c \
-  l10nflist.c \
-  explodename.c \
-  dcigettext.c \
-  dcngettext.c \
-  dngettext.c \
-  ngettext.c \
-  plural.y \
-  plural-exp.c \
-  localcharset.c \
-  relocatable.c \
-  localename.c \
-  log.c \
-  printf.c \
-  osdep.c \
-  os2compat.c \
-  intl-compat.c
-OBJECTS = \
-  bindtextdom.$lo \
-  dcgettext.$lo \
-  dgettext.$lo \
-  gettext.$lo \
-  finddomain.$lo \
-  loadmsgcat.$lo \
-  localealias.$lo \
-  textdomain.$lo \
-  l10nflist.$lo \
-  explodename.$lo \
-  dcigettext.$lo \
-  dcngettext.$lo \
-  dngettext.$lo \
-  ngettext.$lo \
-  plural.$lo \
-  plural-exp.$lo \
-  localcharset.$lo \
-  relocatable.$lo \
-  localename.$lo \
-  log.$lo \
-  printf.$lo \
-  osdep.$lo \
-  intl-compat.$lo
-DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
-DISTFILES.generated = plural.c
-DISTFILES.normal = VERSION
-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
-libgnuintl.h_vms Makefile.vms \
-libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
-
-all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
-all-no: all-no-@BUILD_INCLUDED_LIBINTL@
-all-no-yes: libgnuintl.$la
-all-no-no:
-
-libintl.a libgnuintl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cru $@ $(OBJECTS)
-	$(RANLIB) $@
-
-libintl.la libgnuintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link \
-	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
-	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-	  -rpath $(libdir) \
-	  -no-undefined
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=7
-LTV_REVISION=0
-LTV_AGE=4
-
-.SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
-
-.c.o:
-	$(COMPILE) $<
-
-.y.c:
-	$(YACC) $(YFLAGS) --output $@ $<
-	rm -f $*.h
-
-bindtextdom.lo: $(srcdir)/bindtextdom.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
-dcgettext.lo: $(srcdir)/dcgettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
-dgettext.lo: $(srcdir)/dgettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
-gettext.lo: $(srcdir)/gettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
-finddomain.lo: $(srcdir)/finddomain.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
-loadmsgcat.lo: $(srcdir)/loadmsgcat.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
-localealias.lo: $(srcdir)/localealias.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
-textdomain.lo: $(srcdir)/textdomain.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
-l10nflist.lo: $(srcdir)/l10nflist.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
-explodename.lo: $(srcdir)/explodename.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
-dcigettext.lo: $(srcdir)/dcigettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
-dcngettext.lo: $(srcdir)/dcngettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
-dngettext.lo: $(srcdir)/dngettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
-ngettext.lo: $(srcdir)/ngettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
-plural.lo: $(srcdir)/plural.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
-plural-exp.lo: $(srcdir)/plural-exp.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
-localcharset.lo: $(srcdir)/localcharset.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
-relocatable.lo: $(srcdir)/relocatable.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
-localename.lo: $(srcdir)/localename.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
-log.lo: $(srcdir)/log.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
-printf.lo: $(srcdir)/printf.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
-osdep.lo: $(srcdir)/osdep.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
-intl-compat.lo: $(srcdir)/intl-compat.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
-
-ref-add.sed: $(srcdir)/ref-add.sin
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
-	mv t-ref-add.sed ref-add.sed
-ref-del.sed: $(srcdir)/ref-del.sin
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
-	mv t-ref-del.sed ref-del.sed
-
-INCLUDES = -I. -I$(srcdir) -I..
-
-libgnuintl.h: $(srcdir)/libgnuintl.h.in
-	sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
-	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
-	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
-	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-	  < $(srcdir)/libgnuintl.h.in > libgnuintl.h
-
-libintl.h: libgnuintl.h
-	cp libgnuintl.h libintl.h
-
-charset.alias: $(srcdir)/config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-	mv t-$@ $@
-
-check: all
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the GNU gettext() function in its C library or in a
-# separate library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
-	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=install \
-	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
-	  if test "@RELOCATABLE@" = yes; then \
-	    dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
-	    if test -n "$$dependencies"; then \
-	      rm -f $(DESTDIR)$(libdir)/libintl.la; \
-	    fi; \
-	  fi; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
-	  $(LIBTOOL) --mode=install \
-	    $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
-	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-	  $(LIBTOOL) --mode=uninstall \
-	    rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    orig=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-add.sed $$orig > $$temp; \
-	    $(INSTALL_DATA) $$temp $$dest; \
-	    rm -f $$temp; \
-	  else \
-	    if test @GLIBC21@ = no; then \
-	      orig=charset.alias; \
-	      sed -f ref-add.sed $$orig > $$temp; \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	      rm -f $$temp; \
-	    fi; \
-	  fi; \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
-	  test -f $(DESTDIR)$(localedir)/locale.alias \
-	    && orig=$(DESTDIR)$(localedir)/locale.alias \
-	    || orig=$(srcdir)/locale.alias; \
-	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	  dest=$(DESTDIR)$(localedir)/locale.alias; \
-	  sed -f ref-add.sed $$orig > $$temp; \
-	  $(INSTALL_DATA) $$temp $$dest; \
-	  rm -f $$temp; \
-	else \
-	  : ; \
-	fi
-install-data: all
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-	  dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
-	  dists="$(DISTFILES.generated)"; \
-	  for file in $$dists; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    $(INSTALL_DATA) $$dir/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  dists="$(DISTFILES.obsolete)"; \
-	  for file in $$dists; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-install-strip: install
-
-installdirs:
-	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=uninstall \
-	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
-	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	    dest=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
-	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	    dest=$(DESTDIR)$(localedir)/locale.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-info dvi ps pdf html:
-
-$(OBJECTS): ../config.h libgnuintl.h
-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
-dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
-explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
-dcigettext.$lo: $(srcdir)/eval-plural.h
-localcharset.$lo: $(srcdir)/localcharset.h
-localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
-printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-ctags: CTAGS
-
-CTAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
-	rm -f *.a *.la *.o *.obj *.lo core core.*
-	rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
-	rm -f -r .libs _libs
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile ID TAGS
-	if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
-	  rm -f ChangeLog.inst $(DISTFILES.normal); \
-	else \
-	  : ; \
-	fi
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  : ; \
-	else \
-	  if test "$(PACKAGE)" = "gettext-runtime"; then \
-	    additional="$(DISTFILES.gettext)"; \
-	  else \
-	    additional="$(DISTFILES.normal)"; \
-	  fi; \
-	  $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-	  for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    cp -p $$dir/$$file $(distdir); \
-	  done; \
-	fi
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status
-# This would be more efficient, but doesn't work any more with autoconf-2.57,
-# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
-#	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/navit/support/glib/Makefile.am b/navit/support/glib/Makefile.am
deleted file mode 100644
index c268053f1..000000000
--- a/navit/support/glib/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -I$(top_srcdir)/navit/support -DMODULE=support_glib
-noinst_LTLIBRARIES = libsupport_glib.la
-libsupport_glib_la_SOURCES = fake.c galiasdef.c gatomic.c gerror.c \
-  ghash.c glib_init.c glist.c gmem.c gmessages.c gprimes.c gprintf.c gslice.c \
-  gslist.c gstrfuncs.c gstring.c gutils.c gutf8.c \
-  fake.h galias.h gerror.h ghash.h glib.h glibconfig.h glibintl.h glist.h \
-  gmacros.h gmem.h gmessages.h gprintf.h gprintfint.h gquark.h gslice.h \
-  gslist.h gstrfuncs.h gthreadprivate.h gtypes.h
diff --git a/navit/support/libc/Makefile.am b/navit/support/libc/Makefile.am
deleted file mode 100644
index fae600f8f..000000000
--- a/navit/support/libc/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=support_libc
-noinst_LTLIBRARIES = libsupport_libc.la
-libsupport_libc_la_SOURCES = libc.c libc_init.c
-if SUPPORT_WIN32CE
-noinst_LIBRARIES = libc.a
-libc_a_SOURCES =
-endif
diff --git a/navit/support/libpng/Makefile.am b/navit/support/libpng/Makefile.am
deleted file mode 100644
index e8ed41c1e..000000000
--- a/navit/support/libpng/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit @ZLIB_CFLAGS@ -DMODULE=support_libpng
-noinst_LTLIBRARIES = libsupport_libpng.la
-libsupport_libpng_la_SOURCES = png.c pngerror.c pngget.c pngmem.c pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c libpng_init.c
-
-#bin_PROGRAMS = pngm2pnm
-#pngm2pnm_LDADD=libsupport_libpng.la @ZLIB_LIBS@
-
diff --git a/navit/support/shapefile/Makefile.am b/navit/support/shapefile/Makefile.am
deleted file mode 100644
index 3f5115ca1..000000000
--- a/navit/support/shapefile/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=support_shapefile
-noinst_LTLIBRARIES = libsupport_shapefile.la
-libsupport_shapefile_la_SOURCES = dbfopen.c shpopen.c shptree.c shapefil.h
diff --git a/navit/support/win32/Makefile.am b/navit/support/win32/Makefile.am
deleted file mode 100644
index aee4350cb..000000000
--- a/navit/support/win32/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=support_win32
-noinst_LTLIBRARIES = libsupport_win32.la
-libsupport_win32_la_SOURCES = mmap.c win32_init.c sys/mman.h ConvertUTF.c ConvertUTF.h serial_io.c addwinsock.c
-
diff --git a/navit/support/wordexp/Makefile.am b/navit/support/wordexp/Makefile.am
deleted file mode 100644
index 44d5ad272..000000000
--- a/navit/support/wordexp/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=support_wordexp
-noinst_LTLIBRARIES = libsupport_wordexp.la
-libsupport_wordexp_la_SOURCES = wordexp.c wordexp_init.c wordexp.h glob.c glob.h
diff --git a/navit/support/zlib/Makefile.am b/navit/support/zlib/Makefile.am
deleted file mode 100644
index a49fe3ca7..000000000
--- a/navit/support/zlib/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=support_zlib
-noinst_LTLIBRARIES = libsupport_zlib.la
-libsupport_zlib_la_SOURCES = adler32.c crc32.c crc32.h infback.c inffast.c inffast.h inffixed.h inflate.c inflate.h inftrees.c inftrees.h zconf.h zlib.h zutil.c zutil.h zlib_init.c
diff --git a/navit/tools/gpx2navit_txt/Makefile.am b/navit/tools/gpx2navit_txt/Makefile.am
deleted file mode 100644
index 05f1ce1a0..000000000
--- a/navit/tools/gpx2navit_txt/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-SUBDIRS = src man 
-
-EXTRA_DIST = gps2shp pinatest2.gpx debian develop
-
-debian-dist:
-	dpkg-buildpackage -rfakeroot -d -tc -us -uc
-
-CLEANFILES = \
-	pinatest2_wpt.shx \
-	pinatest2_wpt.shp \
-	pinatest2_wpt.dbf \
-	pinatest2_trk.shx \
-	pinatest2_trk.shp \
-	pinatest2_trk.dbf \
-	pinatest2_rte.shx \
-	pinatest2_rte.shp \
-	pinatest2_rte.dbf \
-	pinatest2_meta.txt 
-
-GPX2SHP=src/gpx2shp
-check: $(GPX2SHP)
-	$(GPX2SHP) || true
-	$(GPX2SHP) --version
-	$(GPX2SHP) -s pinatest2.gpx
-	$(GPX2SHP) -e pinatest2.gpx
-	$(GPX2SHP) -p pinatest2.gpx
-	$(GPX2SHP) -v pinatest2.gpx > /dev/null
diff --git a/navit/tools/gpx2navit_txt/man/Makefile.am b/navit/tools/gpx2navit_txt/man/Makefile.am
deleted file mode 100644
index 71f0f055d..000000000
--- a/navit/tools/gpx2navit_txt/man/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-man_MANS 	= gpx2navit_txt.1 
-EXTRA_DIST 	= $(man_MANS)
diff --git a/navit/tools/gpx2navit_txt/src/Makefile.am b/navit/tools/gpx2navit_txt/src/Makefile.am
deleted file mode 100644
index 5cce6fa3c..000000000
--- a/navit/tools/gpx2navit_txt/src/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-bin_PROGRAMS = gpx2navit_txt 
-
-gpx2navit_txt_SOURCES = \
-	emess.h \
-	geod_for.c \
-	geod_inv.c \
-	geod_set.c \
-	geodesic.h \
-	gpx2navit_txt.h \
-	main.c \
-	misc.c \
-	utils.c \
-	parser.c \
-	elementControl.c\
-	setwpt.c \
-	setpath.c \
-	setmeta.c \
-	errorcode.h
-
-INCLUDES= -I$(srcdir)
-
-AM_CFLAGS =  -g 
-
-debian-dist:
-	dpkg-buildpackage -rfakeroot -d -tc -us -uc
-
diff --git a/navit/vehicle/Makefile.am b/navit/vehicle/Makefile.am
deleted file mode 100644
index 80fc84db7..000000000
--- a/navit/vehicle/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-SUBDIRS=
-if VEHICLE_MAEMO
-  SUBDIRS += maemo
-endif
-if VEHICLE_ANDROID
-  SUBDIRS += android
-endif
-if VEHICLE_IPHONE
-  SUBDIRS += iphone
-endif
-if VEHICLE_DEMO
-  SUBDIRS += demo
-endif
-if VEHICLE_FILE
-  SUBDIRS += file
-endif
-if VEHICLE_GPSD
-  SUBDIRS += gpsd
-endif
-if VEHICLE_GPSD_DBUS
-  SUBDIRS += gpsd_dbus
-endif
-if VEHICLE_GYPSY
-  SUBDIRS += gypsy
-endif
-if VEHICLE_NULL
-  SUBDIRS += null
-endif
-if VEHICLE_WINCE
-  SUBDIRS += wince
-endif
-if VEHICLE_WEBOS
-  SUBDIRS += webos
-endif
diff --git a/navit/vehicle/android/Makefile.am b/navit/vehicle/android/Makefile.am
deleted file mode 100644
index 7f7799acb..000000000
--- a/navit/vehicle/android/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_android
-modulevehicle_LTLIBRARIES = libvehicle_android.la
-libvehicle_android_la_SOURCES = vehicle_android.c
-libvehicle_android_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/vehicle/demo/Makefile.am b/navit/vehicle/demo/Makefile.am
deleted file mode 100644
index 5662119d4..000000000
--- a/navit/vehicle/demo/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_demo
-if PLUGINS
-modulevehicle_LTLIBRARIES = libvehicle_demo.la
-else
-noinst_LTLIBRARIES = libvehicle_demo.la
-endif
-libvehicle_demo_la_SOURCES = vehicle_demo.c
-libvehicle_demo_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/vehicle/file/Makefile.am b/navit/vehicle/file/Makefile.am
deleted file mode 100644
index ce3a45b65..000000000
--- a/navit/vehicle/file/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit
-modulevehicle_LTLIBRARIES = libvehicle_file.la libvehicle_pipe.la libvehicle_socket.la libvehicle_serial.la
-libvehicle_file_la_CFLAGS=-DMODULE=vehicle_file
-libvehicle_file_la_SOURCES = vehicle_file.c
-libvehicle_file_la_LDFLAGS = -module -avoid-version @NAVIT_SOCKET_LDFLAGS@ @NAVIT_MODULE_LDFLAGS@
-libvehicle_pipe_la_CFLAGS=-DMODULE=vehicle_pipe
-libvehicle_pipe_la_SOURCES = vehicle_pipe.c
-libvehicle_pipe_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
-libvehicle_socket_la_CFLAGS=-DMODULE=vehicle_socket
-libvehicle_socket_la_SOURCES = vehicle_socket.c
-libvehicle_socket_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
-libvehicle_serial_la_CFLAGS=-DMODULE=vehicle_serial
-libvehicle_serial_la_SOURCES = vehicle_serial.c
-libvehicle_serial_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/vehicle/gpsd/Makefile.am b/navit/vehicle/gpsd/Makefile.am
deleted file mode 100644
index 1c47ccc56..000000000
--- a/navit/vehicle/gpsd/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @GPSBT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_gpsd
-modulevehicle_LTLIBRARIES = libvehicle_gpsd.la
-libvehicle_gpsd_la_SOURCES = vehicle_gpsd.c
-libvehicle_gpsd_la_LIBADD = @GPSD_LIBS@ @GPSBT_LIBS@
-libvehicle_gpsd_la_LDFLAGS = -module -avoid-version
diff --git a/navit/vehicle/gpsd_dbus/Makefile.am b/navit/vehicle/gpsd_dbus/Makefile.am
deleted file mode 100644
index 4685d2ea8..000000000
--- a/navit/vehicle/gpsd_dbus/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_gpsd_dbus
-modulevehicle_LTLIBRARIES = libvehicle_gpsd_dbus.la
-libvehicle_gpsd_dbus_la_SOURCES = vehicle_gpsd_dbus.c
-libvehicle_gpsd_dbus_la_LIBADD = @DBUS_LIBS@
-libvehicle_gpsd_dbus_la_LDFLAGS = -module -avoid-version
diff --git a/navit/vehicle/gypsy/Makefile.am b/navit/vehicle/gypsy/Makefile.am
deleted file mode 100644
index 1e997f23c..000000000
--- a/navit/vehicle/gypsy/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_gypsy
-modulevehicle_LTLIBRARIES = libvehicle_gypsy.la
-libvehicle_gypsy_la_SOURCES = vehicle_gypsy.c
-libvehicle_gypsy_la_LIBADD = @GYPSY_LIBS@
-libvehicle_gypsy_la_LDFLAGS = -module -avoid-version
diff --git a/navit/vehicle/iphone/Makefile.am b/navit/vehicle/iphone/Makefile.am
deleted file mode 100644
index 7abb872f4..000000000
--- a/navit/vehicle/iphone/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_iphone
-modulevehicle_LTLIBRARIES = libvehicle_iphone.la
-libvehicle_iphone_la_SOURCES = vehicle_iphone.c corelocation.m
-libvehicle_iphone_la_LDFLAGS = -module -Wl,-framework,CoreLocation
-libvehicle_iphone_la_LIBADD = @IPHONE_LIBS@
diff --git a/navit/vehicle/maemo/Makefile.am b/navit/vehicle/maemo/Makefile.am
deleted file mode 100644
index d82bdb699..000000000
--- a/navit/vehicle/maemo/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @LIBLOCATION_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_maemo
-modulevehicle_LTLIBRARIES = libvehicle_maemo.la
-libvehicle_maemo_la_SOURCES = vehicle_maemo.c
-libvehicle_maemo_la_LIBADD = @LIBLOCATION_LIBS@
-libvehicle_maemo_la_LDFLAGS = -module -avoid-version
diff --git a/navit/vehicle/null/Makefile.am b/navit/vehicle/null/Makefile.am
deleted file mode 100644
index 83387eb27..000000000
--- a/navit/vehicle/null/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_null
-if PLUGINS
-  modulevehicle_LTLIBRARIES = libvehicle_null.la
-else
-  noinst_LTLIBRARIES = libvehicle_null.la
-endif
-libvehicle_null_la_SOURCES = vehicle_null.c
-libvehicle_null_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
diff --git a/navit/vehicle/webos/Makefile.am b/navit/vehicle/webos/Makefile.am
deleted file mode 100644
index 15f8767fc..000000000
--- a/navit/vehicle/webos/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @SDL_CFLAGS@ @LIBPDL_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_webos
-modulevehicle_LTLIBRARIES = libvehicle_webos.la
-libvehicle_webos_la_SOURCES = vehicle_webos.c bluetooth.c cJSON.c
-libvehicle_webos_la_LDFLAGS = @SDL_LIBS@ @LIBPDL_LIBS@ -module -avoid-version
diff --git a/navit/vehicle/wince/Makefile.am b/navit/vehicle/wince/Makefile.am
deleted file mode 100644
index af6fcb19d..000000000
--- a/navit/vehicle/wince/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_wince
-if PLUGINS
-modulevehicle_LTLIBRARIES = libvehicle_wince.la
-else
-noinst_LTLIBRARIES = libvehicle_wince.la
-endif
-libvehicle_wince_la_SOURCES = vehicle_wince.c
-libvehicle_wince_la_LDFLAGS = -module -avoid-version
diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am
deleted file mode 100644
index 40b7cc851..000000000
--- a/navit/xpm/Makefile.am
+++ /dev/null
@@ -1,341 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-
-image_DATA = cemetery.xpm
-image_DATA += dumping_station.xpm
-image_DATA += highway_exit.xpm
-image_DATA += hunting_stand.xpm
-image_DATA += level_crossing.xpm
-image_DATA += tower.xpm
-image_DATA += trailerpark.xpm
-image_DATA += public_office.xpm
-
-
-## Obsolete. Should be removed eventually...
-
-image_DATA += biergarten.xpm
-image_DATA += bus_halt.xpm
-image_DATA += car_dealer.xpm
-image_DATA += castle.xpm
-image_DATA += library.xpm
-image_DATA += memorial.xpm
-image_DATA += picnic.xpm
-image_DATA += potable_water.xpm
-image_DATA += restroom.xpm
-image_DATA += sport.xpm
-image_DATA += menu.xpm
-image_DATA += toggle_fullscreen.xpm
-
-## Obsolete end
-
-
-image_DATA += flag_bk_tr.xpm
-image_DATA += flag_bk_wh.xpm
-image_DATA += flag_bl_wh.xpm
-image_DATA += flag_wh_bk.xpm
-
-image_DATA += gc_tradi.xpm
-image_DATA += gc_multi.xpm
-image_DATA += gc_mystery.xpm
-image_DATA += gc_event.xpm
-image_DATA += gc_reference.xpm
-image_DATA += gc_webcam.xpm
-image_DATA += gc_question.xpm
-image_DATA += gc_stages.xpm
-
-image_DATA += nav_left_1.xpm
-image_DATA += nav_left_2.xpm
-image_DATA += nav_right_1.xpm
-image_DATA += nav_right_2.xpm
-image_DATA += nav_straight.xpm
-image_DATA += nav_straight_32.xpm
-image_DATA += nav_left_1_32.xpm
-image_DATA += nav_left_2_32.xpm
-image_DATA += nav_right_1_32.xpm
-image_DATA += nav_right_2_32.xpm
-
-svgs  = gui_about.svg
-svgs += gui_actions.svg
-svgs += gui_active.svg
-svgs += gui_android_menu.svg
-svgs += gui_bookmark.svg
-svgs += gui_formerdests.svg
-svgs += gui_display.svg
-svgs += gui_help.svg
-svgs += gui_home.svg
-svgs += gui_inactive.svg
-svgs += gui_map.svg
-svgs += gui_maps.svg
-svgs += gui_rules.svg
-svgs += gui_settings.svg
-svgs += gui_sound.svg
-svgs += gui_sound_off.svg
-svgs += gui_tools.svg
-svgs += gui_fullscreen.svg
-svgs += gui_leave_fullscreen.svg
-svgs += gui_quit.svg
-svgs += gui_stop.svg
-svgs += gui_town.svg
-svgs += gui_vehicle.svg
-svgs += gui_vehicle_pedestrian.svg
-svgs += gui_zoom_in.svg
-svgs += gui_zoom_out.svg
-svgs += zoom_in.svg
-svgs += zoom_out.svg
-svgs += gui_select_street.svg
-svgs += gui_select_town.svg
-svgs += gui_select_country.svg
-svgs += gui_arrow_left.svg
-svgs += gui_arrow_right.svg
-svgs += gui_arrow_up.svg
-svgs += gui_arrow_down.svg
-svgs += gui_menu.svg
-svgs += gui_strength_0.svg
-svgs += gui_strength_1.svg
-svgs += gui_strength_2.svg
-svgs += gui_strength_3.svg
-svgs += gui_strength_4.svg
-svgs += gui_strength_5.svg
-svgs += gui_minus.svg
-svgs += gui_plus.svg
-svgs += gui_log.svg
-svgs += gui_search.svg
-svgs += menu.svg
-svgs += toggle_fullscreen.svg
-
-svgs += airport.svg
-svgs += atm.svg
-svgs += attraction.svg
-svgs += bahai.svg
-svgs += bank.svg
-svgs += bar.svg
-svgs += beer.svg
-svgs += bench.svg
-svgs += bicycle_parking.svg
-svgs += bicycle_rental.svg
-svgs += bicycle_shop.svg
-svgs += biergarten.svg
-svgs += boat_ramp.svg
-svgs += boundary_stone.svg
-svgs += buddhist.svg
-svgs += bus.svg
-svgs += bus_stop.svg
-svgs += cafe.svg
-svgs += camping.svg
-svgs += car_dealer.svg
-svgs += car_rent.svg
-svgs += car_sharing.svg
-svgs += casino.svg
-svgs += castle.svg
-svgs += church.svg
-svgs += cinema.svg
-svgs += cursor.svg
-svgs += cursor225.svg
-svgs += cursor450.svg
-svgs += cursor675.svg
-svgs += cursor_still.svg
-svgs += dam.svg
-svgs += danger.svg
-svgs += daymark.svg
-svgs += drinking_water.svg
-svgs += emergency.svg
-svgs += exit.svg
-svgs += fastfood.svg
-svgs += firebrigade.svg
-svgs += fountain.svg
-svgs += fuel.svg
-svgs += golf.svg
-svgs += heliport.svg
-svgs += hindu.svg
-svgs += hospital.svg
-svgs += hotel.svg
-svgs += information.svg
-svgs += islamic.svg
-svgs += jain.svg
-svgs += jewish.svg
-svgs += justice.svg
-svgs += library.svg
-svgs += mark.svg
-svgs += memorial.svg
-svgs += menu.svg
-svgs += military.svg
-svgs += mini_roundabout.svg
-svgs += museum.svg
-svgs += pagan.svg
-svgs += parking.svg
-svgs += pastafarian.svg
-svgs += peak.svg
-svgs += pharmacy.svg
-svgs += picnic.svg
-svgs += police.svg
-svgs += post.svg
-svgs += rail_station.svg
-svgs += repair_service.svg
-svgs += resort.svg
-svgs += restaurant.svg
-svgs += ruins.svg
-svgs += school.svg
-svgs += shelter.svg
-svgs += shinto.svg
-svgs += shop_apparel.svg
-svgs += shop_computer.svg
-svgs += shop_department.svg
-svgs += shop_grocery.svg
-svgs += shopping.svg
-svgs += sikh.svg
-svgs += skiing.svg
-svgs += sport.svg
-svgs += stadium.svg
-svgs += status_calculating_bk.svg
-svgs += status_calculating_wh.svg
-svgs += status_no_destination_bk.svg
-svgs += status_no_destination_wh.svg
-svgs += status_no_route_bk.svg
-svgs += status_no_route_wh.svg
-svgs += status_position_wait_bk.svg
-svgs += status_position_wait_wh.svg
-svgs += status_recalculating_bk.svg
-svgs += status_recalculating_wh.svg
-svgs += status_routing_bk.svg
-svgs += status_routing_wh.svg
-svgs += swimming.svg
-svgs += taoist.svg
-svgs += taxi.svg
-svgs += tec_common.svg
-svgs += telephone.svg
-svgs += theater.svg
-svgs += toggle_fullscreen.svg
-svgs += toilets.svg
-svgs += townhall.svg
-svgs += traffic_signals.svg
-svgs += unknown.svg
-svgs += viewpoint.svg
-svgs += wifi.svg
-svgs += worship.svg
-svgs += zoo.svg
-svgs += zoom_in.svg
-svgs += zoom_out.svg
-
-
-nav_svgs =  nav_left_1_bk.svg nav_left_1_wh.svg nav_left_2_bk.svg nav_left_2_wh.svg nav_left_3_bk.svg nav_left_3_wh.svg
-nav_svgs += nav_right_1_bk.svg nav_right_1_wh.svg nav_right_2_bk.svg nav_right_2_wh.svg nav_right_3_bk.svg nav_right_3_wh.svg
-nav_svgs += nav_roundabout_l1_bk.svg nav_roundabout_l1_wh.svg nav_roundabout_l2_bk.svg nav_roundabout_l2_wh.svg
-nav_svgs += nav_roundabout_l3_bk.svg nav_roundabout_l3_wh.svg nav_roundabout_l4_bk.svg nav_roundabout_l4_wh.svg
-nav_svgs += nav_roundabout_l5_bk.svg nav_roundabout_l5_wh.svg nav_roundabout_l6_bk.svg nav_roundabout_l6_wh.svg
-nav_svgs += nav_roundabout_l7_bk.svg nav_roundabout_l7_wh.svg nav_roundabout_l8_bk.svg nav_roundabout_l8_wh.svg
-nav_svgs += nav_roundabout_r1_bk.svg nav_roundabout_r1_wh.svg nav_roundabout_r2_bk.svg nav_roundabout_r2_wh.svg
-nav_svgs += nav_roundabout_r3_bk.svg nav_roundabout_r3_wh.svg nav_roundabout_r4_bk.svg nav_roundabout_r4_wh.svg
-nav_svgs += nav_roundabout_r5_bk.svg nav_roundabout_r5_wh.svg nav_roundabout_r6_bk.svg nav_roundabout_r6_wh.svg
-nav_svgs += nav_roundabout_r7_bk.svg nav_roundabout_r7_wh.svg nav_roundabout_r8_bk.svg nav_roundabout_r8_wh.svg
-nav_svgs += nav_straight_bk.svg nav_straight_wh.svg nav_turnaround_left_bk.svg nav_turnaround_left_wh.svg
-nav_svgs += nav_turnaround_right_bk.svg nav_turnaround_right_wh.svg nav_destination_bk.svg nav_destination_wh.svg
-
-flag_svgs  = country_.svgz country_AD.svgz country_AE.svgz country_AF.svgz country_AG.svgz country_AI.svgz country_AL.svgz country_AM.svgz
-flag_svgs += country_AN.svgz country_AO.svgz country_AQ.svgz country_AR.svgz country_AS.svgz country_AT.svgz country_AU.svgz country_AW.svgz
-flag_svgs += country_AX.svgz country_AZ.svgz country_BA.svgz country_BB.svgz country_BD.svgz country_BE.svgz country_BF.svgz
-flag_svgs += country_BG.svgz country_BH.svgz country_BI.svgz country_BJ.svgz country_BL.svgz country_BM.svgz country_BN.svgz
-flag_svgs += country_BO.svgz country_BR.svgz country_BS.svgz country_BT.svgz country_BV.svgz country_BW.svgz country_BY.svgz
-flag_svgs += country_BZ.svgz country_CA.svgz country_CC.svgz country_CD.svgz country_CF.svgz country_CG.svgz country_CH.svgz
-flag_svgs += country_CI.svgz country_CK.svgz country_CL.svgz country_CM.svgz country_CN.svgz country_CO.svgz country_CR.svgz
-flag_svgs += country_CU.svgz country_CV.svgz country_CX.svgz country_CY.svgz country_CZ.svgz country_DE.svgz country_DJ.svgz
-flag_svgs += country_DK.svgz country_DM.svgz country_DO.svgz country_DZ.svgz country_EC.svgz country_EE.svgz country_EG.svgz
-flag_svgs += country_EH.svgz country_ER.svgz country_ES.svgz country_ET.svgz country_FI.svgz country_FJ.svgz country_FK.svgz
-flag_svgs += country_FM.svgz country_FO.svgz country_FR.svgz country_GA.svgz country_GB.svgz country_GD.svgz country_GE.svgz
-flag_svgs += country_GF.svgz country_GG.svgz country_GH.svgz country_GI.svgz country_GL.svgz country_GM.svgz country_GN.svgz
-flag_svgs += country_GP.svgz country_GQ.svgz country_GR.svgz country_GS.svgz country_GT.svgz country_GU.svgz country_GW.svgz
-flag_svgs += country_GY.svgz country_HK.svgz country_HM.svgz country_HN.svgz country_HR.svgz country_HT.svgz country_HU.svgz
-flag_svgs += country_ID.svgz country_IE.svgz country_IL.svgz country_IM.svgz country_IN.svgz country_IO.svgz country_IQ.svgz
-flag_svgs += country_IR.svgz country_IS.svgz country_IT.svgz country_JE.svgz country_JM.svgz country_JO.svgz country_JP.svgz
-flag_svgs += country_KE.svgz country_KG.svgz country_KH.svgz country_KI.svgz country_KM.svgz country_KN.svgz country_KP.svgz
-flag_svgs += country_KR.svgz country_KW.svgz country_KY.svgz country_KZ.svgz country_LA.svgz country_LB.svgz country_LC.svgz
-flag_svgs += country_LI.svgz country_LK.svgz country_LR.svgz country_LS.svgz country_LT.svgz country_LU.svgz country_LV.svgz
-flag_svgs += country_LY.svgz country_MA.svgz country_MC.svgz country_MD.svgz country_ME.svgz country_MF.svgz country_MG.svgz
-flag_svgs += country_MH.svgz country_MK.svgz country_ML.svgz country_MM.svgz country_MN.svgz country_MO.svgz country_MP.svgz
-flag_svgs += country_MQ.svgz country_MR.svgz country_MS.svgz country_MT.svgz country_MU.svgz country_MV.svgz country_MW.svgz
-flag_svgs += country_MX.svgz country_MY.svgz country_MZ.svgz country_NA.svgz country_NC.svgz country_NE.svgz country_NF.svgz
-flag_svgs += country_NG.svgz country_NI.svgz country_NL.svgz country_NO.svgz country_NP.svgz country_NR.svgz country_NU.svgz
-flag_svgs += country_NZ.svgz country_OM.svgz country_PA.svgz country_PE.svgz country_PF.svgz country_PG.svgz country_PH.svgz
-flag_svgs += country_PK.svgz country_PL.svgz country_PM.svgz country_PN.svgz country_PR.svgz country_PS.svgz country_PT.svgz
-flag_svgs += country_PW.svgz country_PY.svgz country_QA.svgz country_RE.svgz country_RO.svgz country_RS.svgz country_RU.svgz
-flag_svgs += country_RW.svgz country_SA.svgz country_SB.svgz country_SC.svgz country_SD.svgz country_SE.svgz country_SG.svgz
-flag_svgs += country_SH.svgz country_SI.svgz country_SJ.svgz country_SK.svgz country_SL.svgz country_SM.svgz country_SN.svgz
-flag_svgs += country_SO.svgz country_SR.svgz country_ST.svgz country_SV.svgz country_SY.svgz country_SZ.svgz country_TC.svgz
-flag_svgs += country_TD.svgz country_TF.svgz country_TG.svgz country_TH.svgz country_TJ.svgz country_TK.svgz country_TL.svgz
-flag_svgs += country_TM.svgz country_TN.svgz country_TO.svgz country_TR.svgz country_TT.svgz country_TV.svgz country_TW.svgz
-flag_svgs += country_TZ.svgz country_UA.svgz country_UG.svgz country_UM.svgz country_US.svgz country_UY.svgz country_UZ.svgz
-flag_svgs += country_VA.svgz country_VC.svgz country_VE.svgz country_VG.svgz country_VI.svgz country_VN.svgz country_VU.svgz
-flag_svgs += country_WF.svgz country_WS.svgz country_YE.svgz country_YT.svgz country_ZA.svgz country_ZM.svgz country_ZW.svgz
-
-if USE_SVG
-  image_DATA += $(svgs) $(nav_svgs) $(flag_svgs)
-endif
-
-if USE_SVG2PNG
-# Implicit rules for generating the PNG files. This only generates the
-# standard size; for additional sizes see below.
-%.png: $(srcdir)/%.svg
-	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
-%.png: $(srcdir)/%.svgz
-	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
-
-pngs  = $(addsuffix .png,$(basename $(svgs)))
-xsize = $(word 1,$(subst x, ,$(scale)))
-ysize = $(word $(words $(scale)),$(subst x, ,$(scale)))
-comma =,
-
-# template to generate scaling rules for the various PNG sizes
-define scaling_rule_template
-%_$(1)_$(1).png: $(srcdir)/%.$(2)
-	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$$@"
-endef
-
-# template to generate scaling rules for the default PNG size
-define scaling_rule_template_def
-$(basename $(1)).png: $(srcdir)/$(1)
-	SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$$@" "$(2)" "$(2)"
-endef
-
-
-# png images of the user interface and other, sizes e.g. "8,16,32,48,96"
-if USE_SVG2PNG_SCALES
-pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs))))
-# create rules from template
-$(foreach extension,svg svgz, $(foreach size, $(subst $(comma), ,@SVG2PNG_SCALES@),$(eval $(call scaling_rule_template,$(size),$(extension)))))
-endif
-
-# png state flags
-if USE_SVG2PNG_SCALES_FLAG
-svg2png_scales_flag = $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@)
-pngs += $(addsuffix .png,$(basename $(flag_svgs)))
-pngs += $(foreach scale, $(wordlist 2,100,$(svg2png_scales_flag)), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
-# create rules from templates
-$(foreach extension,svg svgz, $(foreach size, $(wordlist 2,100,$(svg2png_scales_flag)),$(eval $(call scaling_rule_template,$(size),$(extension)))))
-$(foreach img,$(flag_svgs), $(foreach size, $(firstword $(svg2png_scales_flag)),$(eval $(call scaling_rule_template_def,$(img),$(size)))))
-endif
-
-# png symbols for navigation
-if USE_SVG2PNG_SCALES_NAV
-pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs))))
-# create rules from template
-$(foreach extension,svg svgz, $(foreach size, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@),$(eval $(call scaling_rule_template,$(size),$(extension)))))
-endif
-
-image_DATA += $(pngs)
-endif
-
-if !SUPPORT_WIN32
-  DESKTOPFILEdir=$(datadir)/applications
-  DESKTOPFILE_DATA = desktop_icons/navit.desktop
-
-  ICON128dir=$(datadir)/icons/hicolor/128x128/apps
-  ICON128_DATA = desktop_icons/128x128/navit.png
-
-  ICON22dir=$(datadir)/icons/hicolor/22x22/apps
-  ICON22_DATA = desktop_icons/22x22/navit.png
-endif
-
-EXTRA_DIST = $(image_DATA) $(DESKTOPFILE_DATA) $(ICON128_DATA) $(ICON22_DATA) navit_svg2png
-
-if USE_SVG2PNG
-clean:
-	rm -f $(pngs)
-endif
diff --git a/po/Makefile.am b/po/Makefile.am
deleted file mode 100644
index 15d8b7b93..000000000
--- a/po/Makefile.am
+++ /dev/null
@@ -1,112 +0,0 @@
-CATALOGS = @MOFILES@
-
-CLEANFILES = $(CATALOGS) navit.pot
-
-# keep this sorted
-EXTRA_DIST = @POIFILES@ \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDialogs.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitGraphics.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/Navit.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitMapDownloader.java \
-	$(top_srcdir)/navit/android/res/values/strings.xml
-
-POTFILES  = \
-	$(top_srcdir)/navit/main.c \
-	$(top_srcdir)/navit/navigation.c \
-	$(top_srcdir)/navit/navit.c \
-	$(top_srcdir)/navit/popup.c \
-	$(top_srcdir)/navit/country.c \
-	$(top_srcdir)/navit/gui/gtk/destination.c \
-	$(top_srcdir)/navit/gui/gtk/gui_gtk_action.c \
-	$(top_srcdir)/navit/gui/gtk/gui_gtk_poi.c \
-	$(top_srcdir)/navit/gui/gtk/gui_gtk_statusbar.c \
-	$(top_srcdir)/navit/gui/internal/gui_internal.c \
-	$(top_srcdir)/navit/gui/internal/gui_internal_bookmark.c \
-	$(top_srcdir)/navit/gui/internal/gui_internal_command.c \
-	$(top_srcdir)/navit/gui/internal/gui_internal_html.c \
-	$(top_srcdir)/navit/gui/internal/gui_internal_menu.c \
-	$(top_srcdir)/navit/gui/internal/gui_internal_poi.c \
-	$(top_srcdir)/navit/gui/internal/gui_internal_search.c \
-	$(top_srcdir)/navit/gui/internal/gui_internal_widget.c \
-	$(top_srcdir)/navit/osd/core/osd_core.c \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDialogs.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitGraphics.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/Navit.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitMapDownloader.java \
-	$(top_builddir)/navit/navit_shipped.c \
-	$(top_builddir)/navit/strings.c
-	
-if XGETTEXT_GLADE
-POTFILES += $(top_builddir)/navit/navit_shipped.glade
-endif
-
-
-SUFFIXES = .po .mo
-
-.po.mo: 
-	dir=`basename $@ .mo` ;\
-	$(MSGFMT) --check --verbose --statistics --output-file=$@ $< && \
-	mkdir -p ../locale/$$dir/LC_MESSAGES && \
-	cp $@ ../locale/$$dir/LC_MESSAGES/navit.mo
-
-all: @MOFILES@
-
-# Trick gettext to get translateable strings out of navit_shipped.xml
-
-$(top_builddir)/navit/navit_shipped.glade: $(top_srcdir)/navit/navit_shipped.xml
-	sed -e "s/vehicleprofile/atkaction/" -e "s/name=/description=/" -e 's/<!\[CDATA\[//' -e 's/\]\]//' <$(top_srcdir)/navit/navit_shipped.xml >$(top_builddir)/navit/navit_shipped.glade
-
-$(top_builddir)/navit/navit_shipped.c: $(top_srcdir)/navit/navit_shipped.xml
-	sed -e 's/|//g' -e 's/^/|/' -e 's/$$/|/' -e 's/\(_("[^"]*")\)/| \1; |/g' -e 's/|[^|]*|//g' <$(top_srcdir)/navit/navit_shipped.xml >$(top_builddir)/navit/navit_shipped.c
-
-# Trick gettext to get translateable strings out of android/strings.xml
-
-$(top_builddir)/navit/strings.c: $(top_srcdir)/navit/android/res/values/strings.xml
-	sed -e "s/\\\\'/'/g" -e 's%.*<string[^>]*name="\(.*\)">\(.*\)</string>%// Android resource: @strings/\1\n_("\2")%g' -e '\%^//%!d'<$(top_srcdir)/navit/android/res/values/strings.xml >$(top_builddir)/navit/strings.c
-
-@POFILES@: navit.pot
-	sed 's/^"Project-Id-Version:.*/"Project-Id-Version: $(PACKAGE_STRING)\\n"/' < $(top_srcdir)/po/$@.in | $(MSGMERGE) --no-fuzzy-matching --verbose -o $(top_builddir)/po/$@ - navit.pot
-
-navit.pot: $(POTFILES)
-	$(XGETTEXT) --no-location --default-domain=navit \
-	--add-comments --keyword=_ --keyword=_n --keyword=navit_nls_gettext --keyword=navit_nls_ngettext:1,2 $(POTFILES)
-	if cmp -s navit.po navit.pot; then \
-	    rm -f navit.po; \
-	else \
-	    mv -f navit.po navit.pot; \
-	fi
-
-install-data-local:  $(CATALOGS)
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/locale
-	chmod 755 $(DESTDIR)$(datadir)/locale 
-	for n in $(CATALOGS) __DuMmY ; do \
-		if test "$$n" -a "$$n" != "__DuMmY" ; then \
-			l=`basename $$n .mo`; \
-			$(mkinstalldirs) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES; \
-			chmod 755 $(DESTDIR)$(datadir)/locale/$$l; \
-			chmod 755 $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES; \
-			$(INSTALL_DATA) -m 644 $$n $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/navit.mo; \
-		fi; \
-	done
-
-uninstall-local:
-	for n in $(CATALOGS) __DuMmY ; do \
-		if test "$$n" -a "$$n" != "__DuMmY" ; then \
-			l=`basename $$n .mo`; \
-			rm -f $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/navit.mo; \
-		fi; \
-	done
-
-distclean-local:
-	rm -f $(top_builddir)/navit/navit_shipped.glade $(top_builddir)/navit/navit_shipped.c $(top_builddir)/navit/strings.c
-	for n in $(CATALOGS) __DuMmY ; do \
-		if test "$$n" -a "$$n" != "__DuMmY" ; then \
-			l=`basename $$n .mo`; \
-			rm -f ../locale/$$l/LC_MESSAGES/navit.mo; \
-			rm -f $$l.po; \
-		fi; \
-	done