From 77d133d27e47a5b3a166e97600031e37a3571607 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 28 Mar 2008 10:40:45 +0000
Subject: [PATCH] package: move java packages to package/java sub directory

---
 package/Config.in                                   | 13 ++-----------
 package/java/Config.in                              | 11 +++++++++++
 package/{ => java}/classpath/Config.in              |  0
 .../classpath/classpath-avr32-endianness.patch      |  0
 package/{ => java}/classpath/classpath.mk           |  0
 package/{ => java}/concierge/Config.in              |  0
 package/{ => java}/concierge/concierge.mk           |  0
 package/{ => java}/concierge/files/concierge        |  0
 package/{ => java}/concierge/files/init.xargs       |  0
 package/{ => java}/jamvm/Config.in                  |  0
 package/{ => java}/jamvm/jamvm-1.5.0.patch.avr32    |  0
 package/{ => java}/jamvm/jamvm.mk                   |  0
 package/java/java.mk                                |  1 +
 13 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 package/java/Config.in
 rename package/{ => java}/classpath/Config.in (100%)
 rename package/{ => java}/classpath/classpath-avr32-endianness.patch (100%)
 rename package/{ => java}/classpath/classpath.mk (100%)
 rename package/{ => java}/concierge/Config.in (100%)
 rename package/{ => java}/concierge/concierge.mk (100%)
 rename package/{ => java}/concierge/files/concierge (100%)
 rename package/{ => java}/concierge/files/init.xargs (100%)
 rename package/{ => java}/jamvm/Config.in (100%)
 rename package/{ => java}/jamvm/jamvm-1.5.0.patch.avr32 (100%)
 rename package/{ => java}/jamvm/jamvm.mk (100%)
 create mode 100644 package/java/java.mk

diff --git a/package/Config.in b/package/Config.in
index 72bdb3f75..c6089db6e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -457,17 +457,8 @@ source "package/libxslt/Config.in"
 source "package/xerces/Config.in"
 endif
 
-menuconfig BR2_JAVA_SUPPORT
-        bool "Java"
-        default y
-        help
-          Support java programs (classpath, vm, osgi)
-
-if BR2_JAVA_SUPPORT
-source "package/classpath/Config.in"
-source "package/jamvm/Config.in"
-source "package/concierge/Config.in"
-endif
+# java support
+source "package/java/Config.in"
 
 menuconfig BR2_GAMES
 	bool "Games"
diff --git a/package/java/Config.in b/package/java/Config.in
new file mode 100644
index 000000000..1ed0475a0
--- /dev/null
+++ b/package/java/Config.in
@@ -0,0 +1,11 @@
+menuconfig BR2_JAVA_SUPPORT
+        bool "Java"
+        default y
+        help
+          Support java programs (classpath, vm, osgi)
+
+if BR2_JAVA_SUPPORT
+source "package/java/classpath/Config.in"
+source "package/java/jamvm/Config.in"
+source "package/java/concierge/Config.in"
+endif
diff --git a/package/classpath/Config.in b/package/java/classpath/Config.in
similarity index 100%
rename from package/classpath/Config.in
rename to package/java/classpath/Config.in
diff --git a/package/classpath/classpath-avr32-endianness.patch b/package/java/classpath/classpath-avr32-endianness.patch
similarity index 100%
rename from package/classpath/classpath-avr32-endianness.patch
rename to package/java/classpath/classpath-avr32-endianness.patch
diff --git a/package/classpath/classpath.mk b/package/java/classpath/classpath.mk
similarity index 100%
rename from package/classpath/classpath.mk
rename to package/java/classpath/classpath.mk
diff --git a/package/concierge/Config.in b/package/java/concierge/Config.in
similarity index 100%
rename from package/concierge/Config.in
rename to package/java/concierge/Config.in
diff --git a/package/concierge/concierge.mk b/package/java/concierge/concierge.mk
similarity index 100%
rename from package/concierge/concierge.mk
rename to package/java/concierge/concierge.mk
diff --git a/package/concierge/files/concierge b/package/java/concierge/files/concierge
similarity index 100%
rename from package/concierge/files/concierge
rename to package/java/concierge/files/concierge
diff --git a/package/concierge/files/init.xargs b/package/java/concierge/files/init.xargs
similarity index 100%
rename from package/concierge/files/init.xargs
rename to package/java/concierge/files/init.xargs
diff --git a/package/jamvm/Config.in b/package/java/jamvm/Config.in
similarity index 100%
rename from package/jamvm/Config.in
rename to package/java/jamvm/Config.in
diff --git a/package/jamvm/jamvm-1.5.0.patch.avr32 b/package/java/jamvm/jamvm-1.5.0.patch.avr32
similarity index 100%
rename from package/jamvm/jamvm-1.5.0.patch.avr32
rename to package/java/jamvm/jamvm-1.5.0.patch.avr32
diff --git a/package/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
similarity index 100%
rename from package/jamvm/jamvm.mk
rename to package/java/jamvm/jamvm.mk
diff --git a/package/java/java.mk b/package/java/java.mk
new file mode 100644
index 000000000..123a0d09b
--- /dev/null
+++ b/package/java/java.mk
@@ -0,0 +1 @@
+include package/java/*/*.mk