6 files changed, 8 insertions, 6 deletions
diff --git a/packages/kaffe/kaffe-gtk_1.1.5.bb b/packages/kaffe/kaffe-gtk_1.1.5.bb
index 2bcec9a929..48077ce1e3 100644
--- a/packages/kaffe/kaffe-gtk_1.1.5.bb
+++ b/packages/kaffe/kaffe-gtk_1.1.5.bb
@@ -3,7 +3,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz"
 S = "${WORKDIR}/kaffe-${PV}"
 
-include kaffe.inc
+require kaffe.inc
 
 DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native"
 
diff --git a/packages/kaffe/kaffe-gtk_cvs.bb b/packages/kaffe/kaffe-gtk_cvs.bb
index c8ff718396..bc464e6e63 100644
--- a/packages/kaffe/kaffe-gtk_cvs.bb
+++ b/packages/kaffe/kaffe-gtk_cvs.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
 S = "${WORKDIR}/kaffe"
 
-include kaffe.inc
+require kaffe.inc
 
 DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native"
 
diff --git a/packages/kaffe/kaffe-qt_cvs.bb b/packages/kaffe/kaffe-qt_cvs.bb
index 023e3fbcb4..bd5d2968f6 100644
--- a/packages/kaffe/kaffe-qt_cvs.bb
+++ b/packages/kaffe/kaffe-qt_cvs.bb
@@ -4,7 +4,7 @@ PV = "1.1.4+cvs${SRCDATE}"
 SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
 S = "${WORKDIR}/kaffe"
 
-include kaffe.inc
+require kaffe.inc
 
 DEPENDS += "libqpe-opie"
 
diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
index ea308f1043..2d536b3dea 100644
--- a/packages/kaffe/kaffe.inc
+++ b/packages/kaffe/kaffe.inc
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.kaffe.org/"
 LICENSE  = "GPL LGPL W3C Classpath BSD"
 
 DEPENDS = "jikes-native fastjar-native libffi zip-native"
+RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
 
 SRC_URI += "file://disable-automake-checks.patch;patch=1"
 
@@ -45,7 +46,6 @@ oe_runconf () {
 
 PACKAGES =+ "${PN}-common"
 FILES_${PN} += "${libdir}/${PN}"
-RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
 FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar"
 
 do_install () {
diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb
index 569301f3f7..d4d6287592 100644
--- a/packages/kaffe/kaffeh-native_1.1.5.bb
+++ b/packages/kaffe/kaffeh-native_1.1.5.bb
@@ -2,7 +2,9 @@ SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar
 S = "${WORKDIR}/kaffe-${PV}"
 PR = "r3"
 
-include kaffe.inc
+require kaffe.inc
+
+RDEPENDS_${PN} = ""
 
 inherit native
 
diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb
index 45bdd4088e..60dab7859e 100644
--- a/packages/kaffe/kaffeh-native_cvs.bb
+++ b/packages/kaffe/kaffeh-native_cvs.bb
@@ -5,7 +5,7 @@ PR = "r3"
 SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
 S = "${WORKDIR}/kaffe"
 
-include kaffe.inc
+require kaffe.inc
 
 inherit native