5 files changed, 26 insertions, 27 deletions
diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc
new file mode 100644
index 0000000000..3754e1580a
--- /dev/null
+++ b/packages/navit/navit.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Navit is a car navigation system with routing engine."
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gtk+"
+RRECOMMENDS = "gpsd speechd flite"
+
+inherit autotools
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
diff --git a/packages/navit/navit_0.0.1.bb b/packages/navit/navit_0.0.1.bb
index 2db71a3e87..f96a04ec16 100644
--- a/packages/navit/navit_0.0.1.bb
+++ b/packages/navit/navit_0.0.1.bb
@@ -1,13 +1,8 @@
-DESCRIPTION = "Navit is a car navigation system with routing engine."
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 gtk+"
-PR = "r2"
+require navit.inc
 
-inherit autotools 
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
            file://compile-fix.patch;patch=1"
 
 EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float"
-
-FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
diff --git a/packages/navit/navit_0.0.2.bb b/packages/navit/navit_0.0.2.bb
index 25e16b7bbf..794f901db5 100644
--- a/packages/navit/navit_0.0.2.bb
+++ b/packages/navit/navit_0.0.2.bb
@@ -1,15 +1,7 @@
-DESCRIPTION = "Navit is a car navigation system with routing engine."
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 gtk+"
-PR = "r1"
+require navit.inc
 
-inherit autotools 
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" 
 
 EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --disable-samplemap --enable-avoid-unaligned --enable-avoid-float"
-
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
-FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
diff --git a/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb
new file mode 100644
index 0000000000..d0c1c553d6
--- /dev/null
+++ b/packages/navit/navit_0.0.3.bb
@@ -0,0 +1,7 @@
+require navit.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb
index 8f158d4f79..8b10c908ec 100644
--- a/packages/navit/navit_cvs.bb
+++ b/packages/navit/navit_cvs.bb
@@ -1,19 +1,13 @@
-DESCRIPTION = "Navit is a car navigation system with routing engine."
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 gtk+"
-PV = "0.0.2+cvs${SRCDATE}"
+require navit.inc
+
+PV = "0.0.3+cvs${SRCDATE}"
 PR = "r0"
 
-inherit autotools
 S = "${WORKDIR}/navit"
 
-SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
-          "
+SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit"
 
 EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
-#--enable-shared
 
 EXTRA_AUTORECONF = " -I m4"
 
-FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
-