classpath-minimal: rework recpies and using share/java

* remove classpath-minimal.inc, 2 files are enough
* use ${DATADIR}/java/classpath-minimal for installing glibj.zip

3 files changed, 39 insertions, 45 deletions

diff --git a/packages/classpath/classpath-minimal-native_0.95.bb b/packages/classpath/classpath-minimal-native_0.95.bb
index c7716ed639..28b25a7cb9 100644
--- a/packages/classpath/classpath-minimal-native_0.95.bb
+++ b/packages/classpath/classpath-minimal-native_0.95.bb
@@ -3,6 +3,5 @@
 # primary goal is to speed up building of java virtual machines
 
 inherit native
-
-require classpath-minimal.inc
-
+require classpath-minimal_${PV}.bb
+PR = "r0"
diff --git a/packages/classpath/classpath-minimal.inc b/packages/classpath/classpath-minimal.inc
deleted file mode 100644
index 5a2587b56c..0000000000
--- a/packages/classpath/classpath-minimal.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "Classpath"
-PROVIDES = "classpath"
-RPROVIDES = "classpath"
-
-S = "${WORKDIR}/classpath-${PV}"
-
-SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
-
-DEPENDS = "ecj-native zip-native"
-
-inherit autotools
-
-
-EXTRA_OECONF = "--with-glibj \
-                --with-ecj=${STAGING_BINDIR_NATIVE}/ecj \
-                --disable-alsa \
-                --disable-gconf-peer \
-                --disable-gtk-peer \
-                --disable-plugin \
-                --disable-dssi \
-                --disable-examples \
-               "
-do_install() {
-        :
-}
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/classpath-minimal/
-        install -m 0644 include/jni.h ${STAGING_INCDIR}/classpath-minimal/
-        install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath-minimal/
-        install -d ${STAGING_LIBDIR}/java/classpath-minimal/
-        install -m 0644 lib/glibj.zip ${STAGING_LIBDIR}/java/classpath-minimal/
-}
-
-PACKAGES = " "
diff --git a/packages/classpath/classpath-minimal_0.95.bb b/packages/classpath/classpath-minimal_0.95.bb
index e489a4efc9..3a4756094f 100644
--- a/packages/classpath/classpath-minimal_0.95.bb
+++ b/packages/classpath/classpath-minimal_0.95.bb
@@ -1,5 +1,39 @@
+DESCRIPTION = "GNU Classpath standard Java libraries"
+HOMEPAGE = "http://www.gnu.org/software/classpath/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Classpath"
+PROVIDES = "classpath"
+RPROVIDES = "classpath"
 
-# classpath-minimal-native has no packages
-# primary goal is to speed up building of java virtual machines
+S = "${WORKDIR}/classpath-${PV}"
 
-require classpath-minimal.inc
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
+DEPENDS = "ecj-native zip-native"
+
+inherit autotools
+
+
+EXTRA_OECONF = "--with-glibj \
+                --with-ecj=${STAGING_BINDIR_NATIVE}/ecj \
+                --disable-alsa \
+                --disable-gconf-peer \
+                --disable-gtk-peer \
+                --disable-plugin \
+                --disable-dssi \
+                --disable-examples \
+               "
+do_install() {
+        :
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni.h ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath-minimal/
+        install -d ${STAGING_DATADIR}/java/classpath-minimal/
+        install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/java/classpath-minimal/
+}
+
+PACKAGES = " "