updated

18 files changed, 359 insertions, 141 deletions

diff --git a/Makefile.am b/Makefile.am
index 72d18c71f..dc7556a82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,15 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-#SUBDIRS = java gnu native compat test doc
-SUBDIRS = lib native doc
+SUBDIRS = lib native doc resource gnu java vm
+
+EXTRA_DIST = \
+AUTHORS \
+BUGS \
+COPYING \
+COPYING.LIB \
+ChangeLog \
+INSTALL \
+NEWS \
+README \
+THANKYOU
 
-EXTRA_DIST = BUGS
diff --git a/configure.in b/configure.in
index 171588ac4..0f8620378 100644
--- a/configure.in
+++ b/configure.in
@@ -144,29 +144,42 @@ AC_ARG_WITH(jdeps,
 AC_PATH_PROG(SH, sh)
 AC_PATH_PROG(FIND, find)
 
-AC_OUTPUT(compat/java.net/Makefile
-compat/Makefile
-Makefile
+AC_OUTPUT(Makefile
 doc/Makefile
+gnu/java/awt/peer/gtk/Makefile
+gnu/java/awt/peer/Makefile
+gnu/java/awt/Makefile
+gnu/java/io/decode/Makefile
 gnu/java/io/Makefile
+gnu/java/io/encode/Makefile
 gnu/java/lang/reflect/Makefile
 gnu/java/lang/Makefile
 gnu/java/Makefile
+gnu/java/beans/editors/Makefile
+gnu/java/beans/info/Makefile
+gnu/java/beans/Makefile
+gnu/java/locale/Makefile
 gnu/java/net/content/text/Makefile
 gnu/java/net/content/Makefile
 gnu/java/net/Makefile
-gnu/java/net/http/Makefile
-gnu/test/Makefile
+gnu/java/net/protocol/file/Makefile
+gnu/java/net/protocol/http/Makefile
+gnu/java/net/protocol/Makefile
+gnu/java/security/Makefile
 gnu/Makefile
 gnu/tools/serialver/Makefile
 gnu/tools/Makefile
+java/beans/Makefile
 java/io/Makefile
 java/lang/reflect/Makefile
 java/lang/Makefile
 java/Makefile
 java/math/Makefile
 java/net/Makefile
+java/security/acl/Makefile
+java/security/interfaces/Makefile
 java/security/Makefile
+java/text/Makefile
 java/util/Makefile
 native/Makefile
 native/java.io/Makefile
@@ -174,13 +187,17 @@ native/java.lang/Makefile
 native/java.lang.reflect/Makefile
 native/java.net/Makefile
 native/lib/Makefile
-native/testsuite/Makefile
-test/java.io/Makefile
-test/Makefile
-test/gnu.java.lang.reflect/Makefile
-test/java.lang.reflect/Makefile
-test/java.net/Makefile
-test/java.util/Makefile
+resource/java/util/Makefile
+resource/java/Makefile
+resource/Makefile
+vm/reference/gnu/vm/stack/Makefile
+vm/reference/gnu/vm/Makefile
+vm/reference/gnu/Makefile
+vm/reference/java/lang/reflect/Makefile
+vm/reference/java/lang/Makefile
+vm/reference/java/Makefile
+vm/reference/Makefile
+vm/Makefile
 lib/deps.sh
 lib/gen-classlist.sh
 lib/Makefile)
diff --git a/gnu/java/Makefile.am b/gnu/java/Makefile.am
index eaa11be48..e9c902270 100644
--- a/gnu/java/Makefile.am
+++ b/gnu/java/Makefile.am
@@ -1,4 +1,4 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = lang net io
+SUBDIRS = awt beans io lang locale net security
 
diff --git a/gnu/java/io/Makefile.am b/gnu/java/io/Makefile.am
index f37781f37..2b1c64b84 100644
--- a/gnu/java/io/Makefile.am
+++ b/gnu/java/io/Makefile.am
@@ -1,5 +1,11 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-gnujavaiodir = $(datadir)/gnu/java/io
+SUBDIRS = decode encode
+
+EXTRA_DIST = \
+ChangeLog \
+ClassLoaderObjectInputStream.java \
+EncodingManager.java \
+NullOutputStream.java \
+ObjectIdentityWrapper.java
 
-gnujavaio_JAVA = NullOutputStream.java ObjectIdentityWrapper.java
diff --git a/gnu/tools/serialver/Makefile.am b/gnu/tools/serialver/Makefile.am
index 47205d48f..6b1a470a5 100644
--- a/gnu/tools/serialver/Makefile.am
+++ b/gnu/tools/serialver/Makefile.am
@@ -1,5 +1,7 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-gnutoolsserialverdir = $(datadir)/gnu/tools/serialver
+##gnutoolsserialverdir = $(datadir)/gnu/tools/serialver
+##gnutoolsserialver_JAVA = Main.java
 
-gnutoolsserialver_JAVA = Main.java
+EXTRA_DIST = \
+Main.java
diff --git a/java/Makefile.am b/java/Makefile.am
index fa5dab942..f2e3ed979 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -1,4 +1,3 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = io lang math net util
-
+SUBDIRS = beans io lang math net security text util
diff --git a/java/io/Makefile.am b/java/io/Makefile.am
index cc1b0fb3c..6b326d085 100644
--- a/java/io/Makefile.am
+++ b/java/io/Makefile.am
@@ -1,6 +1,82 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-javaiodir = $(datadir)/java/io
-
-javaio_JAVA = BlockDataException.java BufferedInputStream.java BufferedOutputStream.java BufferedReader.java BufferedWriter.java ByteArrayInputStream.java ByteArrayOutputStream.java CharArrayReader.java CharArrayWriter.java CharConversionException.java DataInput.java DataInputStream.java DataOutput.java DataOutputStream.java EOFException.java Externalizable.java File.java FileDescriptor.java FileInputStream.java FileNotFoundException.java FileOutputStream.java FilePermission.java FileReader.java FileWriter.java FilenameFilter.java FilterInputStream.java FilterOutputStream.java FilterReader.java FilterWriter.java IOException.java InputStream.java InputStreamReader.java InterruptedIOException.java InvalidClassException.java InvalidObjectException.java LineNumberInputStream.java LineNumberReader.java NotActiveException.java NotSerializableException.java ObjectInput.java ObjectInputStream.java ObjectInputValidation.java ObjectOutput.java ObjectOutputStream.java ObjectStreamClass.java ObjectStreamConstants.java ObjectStreamException.java ObjectStreamField.java OptionalDataException.java OutputStream.java OutputStreamWriter.java PipedInputStream.java PipedOutputStream.java PipedReader.java PipedWriter.java PrintStream.java PrintWriter.java PushbackInputStream.java PushbackReader.java RandomAccessFile.java Reader.java Replaceable.java Resolvable.java SequenceInputStream.java Serializable.java SerializablePermission.java StreamCorruptedException.java StreamTokenizer.java StringBufferInputStream.java StringReader.java StringWriter.java SyncFailedException.java UTFDataFormatException.java UnsupportedEncodingException.java WriteAbortedException.java Writer.java
-
+EXTRA_DIST = \
+ChangeLog \
+BlockDataException.java \
+BufferedInputStream.java \
+BufferedOutputStream.java \
+BufferedReader.java \
+BufferedWriter.java \
+ByteArrayInputStream.java \
+ByteArrayOutputStream.java \
+CharArrayReader.java \
+CharArrayWriter.java \
+CharConversionException.java \
+DataInput.java \
+DataInputStream.java \
+DataOutput.java \
+DataOutputStream.java \
+EOFException.java \
+Externalizable.java \
+File.java \
+FileDescriptor.java \
+FileFilter.java \
+FileInputStream.java \
+FileNotFoundException.java \
+FileOutputStream.java \
+FilePermission.java \
+FileReader.java \
+FileWriter.java \
+FilenameFilter.java \
+FilterInputStream.java \
+FilterOutputStream.java \
+FilterReader.java \
+FilterWriter.java \
+IOException.java \
+InputStream.java \
+InputStreamReader.java \
+InterruptedIOException.java \
+InvalidClassException.java \
+InvalidObjectException.java \
+LineNumberInputStream.java \
+LineNumberReader.java \
+NotActiveException.java \
+NotSerializableException.java \
+ObjectInput.java \
+ObjectInputStream.java \
+ObjectInputValidation.java \
+ObjectOutput.java \
+ObjectOutputStream.java \
+ObjectStreamClass.java \
+ObjectStreamConstants.java \
+ObjectStreamException.java \
+ObjectStreamField.java \
+OptionalDataException.java \
+OutputStream.java \
+OutputStreamWriter.java \
+PipedInputStream.java \
+PipedOutputStream.java \
+PipedReader.java \
+PipedWriter.java \
+PrintStream.java \
+PrintWriter.java \
+PushbackInputStream.java \
+PushbackReader.java \
+RandomAccessFile.java \
+Reader.java \
+Replaceable.java \
+Resolvable.java \
+SequenceInputStream.java \
+Serializable.java \
+SerializablePermission.java \
+StreamCorruptedException.java \
+StreamTokenizer.java \
+StringBufferInputStream.java \
+StringReader.java \
+StringWriter.java \
+SyncFailedException.java \
+UTFDataFormatException.java \
+UnsupportedEncodingException.java \
+WriteAbortedException.java \
+Writer.java
+ 
diff --git a/java/lang/Makefile.am b/java/lang/Makefile.am
index f4171f774..13bfdd1a4 100644
--- a/java/lang/Makefile.am
+++ b/java/lang/Makefile.am
@@ -2,6 +2,75 @@
 
 SUBDIRS = reflect
 
-javalangdir = $(datadir)/java/lang
+EXTRA_DIST = \
+AbstractMethodError.java \
+ArithmeticException.java \
+ArrayIndexOutOfBoundsException.java \
+ArrayStoreException.java \
+Boolean.java \
+Byte.java \
+Character.java \
+ClassCastException.java \
+ClassCircularityError.java \
+ClassFormatError.java \
+ClassLoader.java \
+ClassNotFoundException.java \
+CloneNotSupportedException.java \
+Cloneable.java \
+Comparable.java \
+Compiler.java \
+Double.java \
+Error.java \
+Exception.java \
+ExceptionInInitializerError.java \
+Float.java \
+IllegalAccessError.java \
+IllegalAccessException.java \
+IllegalArgumentException.java \
+IllegalMonitorStateException.java \
+IllegalStateException.java \
+IllegalThreadStateException.java \
+IncompatibleClassChangeError.java \
+IndexOutOfBoundsException.java \
+InstantiationError.java \
+InstantiationException.java \
+Integer.java \
+InternalError.java \
+InterruptedException.java \
+LinkageError.java \
+Long.java \
+Math.java \
+NegativeArraySizeException.java \
+NoClassDefFoundError.java \
+NoSuchFieldError.java \
+NoSuchFieldException.java \
+NoSuchMethodError.java \
+NoSuchMethodException.java \
+NullPointerException.java \
+Number.java \
+NumberFormatException.java \
+Object.java \
+OutOfMemoryError.java \
+Process.java \
+Runnable.java \
+RuntimeException.java \
+RuntimePermission.java \
+SecurityException.java \
+SecurityManager.java \
+Short.java \
+StackOverflowError.java \
+String.java \
+StringBuffer.java \
+StringIndexOutOfBoundsException.java \
+System.java \
+ThreadDeath.java \
+ThreadGroup.java \
+Throwable.java \
+UnknownError.java \
+UnsatisfiedLinkError.java \
+UnsupportedClassVersionError.java \
+UnsupportedOperationException.java \
+VerifyError.java \
+VirtualMachineError.java \
+Void.java
 
-javalang_JAVA = Boolean.java Byte.java Cloneable.java Compiler.java Comparable.java Integer.java Long.java Number.java Runnable.java Short.java String.java StringBuffer.java UnsupportedOperationException.java Void.java
diff --git a/java/lang/reflect/Makefile.am b/java/lang/reflect/Makefile.am
index 35622f480..cb1d73bbe 100644
--- a/java/lang/reflect/Makefile.am
+++ b/java/lang/reflect/Makefile.am
@@ -1,6 +1,10 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-javalangreflectdir = $(datadir)/java/lang/reflect
-
-javalangreflect_JAVA = Array.java Constructor.java Field.java InvocationTargetException.java Member.java Method.java Modifier.java
-
+EXTRA_DIST = \
+Array.java \
+ChangeLog \
+InvocationTargetException.java \
+Member.java \
+Modifier.java \
+README \
+TODO
diff --git a/java/math/Makefile.am b/java/math/Makefile.am
index 914ea4ca8..fe0575be1 100644
--- a/java/math/Makefile.am
+++ b/java/math/Makefile.am
@@ -1,7 +1,4 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-javamathdir = $(datadir)/java/math
-
-javamath_JAVA = BigInteger.java
-
-
+EXTRA_DIST = \
+BigInteger.java
diff --git a/java/net/Makefile.am b/java/net/Makefile.am
index df72ff65e..c8b5015cb 100644
--- a/java/net/Makefile.am
+++ b/java/net/Makefile.am
@@ -1,8 +1,44 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-javanetdir = $(datadir)/java/net
-
-javanet_JAVA = BindException.java ConnectException.java ContentHandler.java ContentHandlerFactory.java DatagramPacket.java DatagramSocket.java DatagramSocketImpl.java FileNameMap.java HttpURLConnection.java InetAddress.java MalformedURLException.java MimeTypeMapper.java MulticastSocket.java NoRouteToHostException.java PasswordAuthentication.java PlainDatagramSocketImpl.java PlainSocketImpl.java ProtocolException.java ServerSocket.java Socket.java SocketException.java SocketImpl.java SocketImplFactory.java SocketInputStream.java SocketOptions.java SocketOutputStream.java URL.java URLConnection.java URLEncoder.java URLStreamHandler.java URLStreamHandlerFactory.java UnknownHostException.java UnknownServiceException.java
-
-EXTRA_DIST = Authenticator.java JarURLConnection.java NetPermission.java SocketPermission.java STATUS TODO
-
+EXTRA_DIST = \
+ChangeLog \
+STATUS \
+TODO \
+Authenticator.java \
+BindException.java \
+ConnectException.java \
+ContentHandler.java \
+ContentHandlerFactory.java \
+DatagramPacket.java \
+DatagramSocket.java \
+DatagramSocketImpl.java \
+FileNameMap.java \
+HttpURLConnection.java \
+InetAddress.java \
+JarURLConnection.java \
+MalformedURLException.java \
+MimeTypeMapper.java \
+MulticastSocket.java \
+NetPermission.java \
+NoRouteToHostException.java \
+PasswordAuthentication.java \
+PlainDatagramSocketImpl.java \
+PlainSocketImpl.java \
+ProtocolException.java \
+ServerSocket.java \
+Socket.java \
+SocketException.java \
+SocketImpl.java \
+SocketImplFactory.java \
+SocketInputStream.java \
+SocketOptions.java \
+SocketOutputStream.java \
+SocketPermission.java \
+URL.java \
+URLConnection.java \
+URLDecoder.java \
+URLEncoder.java \
+URLStreamHandler.java \
+URLStreamHandlerFactory.java \
+UnknownHostException.java \
+UnknownServiceException.java
diff --git a/java/security/Makefile.am b/java/security/Makefile.am
index ecdfcd118..ded17cbd9 100644
--- a/java/security/Makefile.am
+++ b/java/security/Makefile.am
@@ -1,5 +1,39 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-javasecuritydir = $(datadir)/java/security
+SUBDIRS = acl interfaces
 
-javasecurity_JAVA = AccessControlException.java AllPermission.java BasicPermission.java Certificate.java CodeSource.java DigestException.java GeneralSecurityException.java Guard.java GuardedObject.java InvalidAlgorithmParameterException.java InvalidKeyException.java InvalidParameterException.java Key.java KeyException.java KeyManagementException.java KeyStoreException.java NoSuchAlgorithmException.java NoSuchProviderException.java Permission.java PermissionCollection.java Permissions.java Principal.java PrivateKey.java PrivilegedAction.java PrivilegedActionException.java PrivilegedExceptionAction.java ProtectionDomain.java Provider.java ProviderException.java PublicKey.java SecurityPermission.java SignatureException.java UnrecoverableKeyException.java UnresolvedPermission.java
+EXTRA_DIST = \
+AccessControlException.java \
+AllPermission.java \
+BasicPermission.java \
+Certificate.java \
+CodeSource.java \
+DigestException.java \
+GeneralSecurityException.java \
+Guard.java \
+GuardedObject.java \
+InvalidAlgorithmParameterException.java \
+InvalidKeyException.java \
+InvalidParameterException.java \
+Key.java \
+KeyException.java \
+KeyManagementException.java \
+KeyStoreException.java \
+NoSuchAlgorithmException.java \
+NoSuchProviderException.java \
+Permission.java \
+PermissionCollection.java \
+Permissions.java \
+Principal.java \
+PrivateKey.java \
+PrivilegedAction.java \
+PrivilegedActionException.java \
+PrivilegedExceptionAction.java \
+ProtectionDomain.java \
+Provider.java \
+ProviderException.java \
+PublicKey.java \
+SecurityPermission.java \
+SignatureException.java \
+UnrecoverableKeyException.java \
+UnresolvedPermission.java
diff --git a/java/security/acl/Makefile.am b/java/security/acl/Makefile.am
index 5381a1173..6ceb5ad8a 100644
--- a/java/security/acl/Makefile.am
+++ b/java/security/acl/Makefile.am
@@ -1,8 +1,11 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-javasecacldir = $(datadir)/java/security/interfaces
-
-javasecacl_JAVA = Acl.java AclEntry.java Group.java Owner.java \
-                  Permission.java AclNotFoundException.java \
-                  LastOwnerException.java NotOwnerException.java
-
+EXTRA_DIST = \
+Acl.java \
+AclEntry.java \
+AclNotFoundException.java \
+Group.java \
+LastOwnerException.java \
+NotOwnerException.java \
+Owner.java \
+Permission.java
diff --git a/java/security/interfaces/Makefile.am b/java/security/interfaces/Makefile.am
index be7c2ff15..3c346952f 100644
--- a/java/security/interfaces/Makefile.am
+++ b/java/security/interfaces/Makefile.am
@@ -1,8 +1,11 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-javasecintrdir = $(datadir)/java/security/interfaces
-
-javasecintr_JAVA = DSAKey.java DSAKeyPairGenerator.java DSAParams.java \
-                   DSAPrivateKey.java DSAPublicKey.java \
-                   RSAPrivateCrtKey.java RSAPrivateKey.java RSAPublicKey.java
-
+EXTRA_DIST = \
+DSAKey.java \
+DSAKeyPairGenerator.java \
+DSAParams.java \
+DSAPrivateKey.java \
+DSAPublicKey.java \
+RSAPrivateCrtKey.java \
+RSAPrivateKey.java \
+RSAPublicKey.java
diff --git a/java/util/Makefile.am b/java/util/Makefile.am
index 6caa104ef..4b6ac54f6 100644
--- a/java/util/Makefile.am
+++ b/java/util/Makefile.am
@@ -1,6 +1,47 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-javautildir = $(datadir)/java/util
-
-javautil_JAVA = AbstractCollection.java AbstractList.java AbstractMap.java AbstractSequentialList.java AbstractSet.java Arrays.java Collection.java Collections.java Comparator.java ConcurrentModificationException.java EmptyStackException.java Enumeration.java Iterator.java List.java ListIterator.java Map.java NoSuchElementException.java Set.java SortedMap.java SortedSet.java
-
+EXTRA_DIST = \
+ChangeLog \
+AbstractCollection.java \
+AbstractList.java \
+AbstractMap.java \
+AbstractSequentialList.java \
+AbstractSet.java \
+Arrays.java \
+BasicMapEntry.java \
+BitSet.java \
+Bucket.java \
+Calendar.java \
+Collection.java \
+Collections.java \
+Comparator.java \
+ConcurrentModificationException.java \
+Date.java \
+Dictionary.java \
+DoubleEnumeration.java \
+EmptyStackException.java \
+Enumeration.java \
+GregorianCalendar.java \
+HashMap.java \
+HashSet.java \
+Hashtable.java \
+Iterator.java \
+LinkedList.java \
+List.java \
+ListIterator.java \
+ListResourceBundle.java \
+Locale.java \
+Map.java \
+MissingResourceException.java \
+NoSuchElementException.java \
+Properties.java \
+PropertyResourceBundle.java \
+ResourceBundle.java \
+Set.java \
+SimpleTimeZone.java \
+SortedMap.java \
+SortedSet.java \
+Stack.java \
+StringTokenizer.java \
+TimeZone.java \
+Vector.java
diff --git a/lib/.deps b/lib/.deps
index e2ffcf2da..2f022d17c 100644
--- a/lib/.deps
+++ b/lib/.deps
@@ -374,20 +374,6 @@
 ./java/security/UnrecoverableKeyException.class: ./java/security/GeneralSecurityException.class
 
 
-# Rules for gnu.test.Result
-#
-./gnu/test/Result.class: ../gnu/test/Result.java
-	$(JAVAC) ../gnu/test/Result.java
-
-
-# Rules for gnu.test.XPass
-#
-./gnu/test/XPass.class: ../gnu/test/XPass.java
-	$(JAVAC) ../gnu/test/XPass.java
-
-./gnu/test/XPass.class: ./gnu/test/Result.class
-
-
 # Rules for gnu.java.awt.peer.gtk.GtkGenericPeer
 #
 ./gnu/java/awt/peer/gtk/GtkGenericPeer.class: ../gnu/java/awt/peer/gtk/GtkGenericPeer.java
@@ -1016,14 +1002,6 @@
 ./java/security/Provider.class: ./java/lang/Exception.class ./java/lang/Throwable.class ./java/io/ObjectInputStream.class ./java/io/ValidatorAndPriority.class ./java/util/Arrays.class ./java/util/AbstractList.class ./java/util/AbstractCollection.class ./java/lang/UnsupportedOperationException.class ./java/lang/RuntimeException.class ./java/lang/String.class ./java/util/Locale.class ./java/io/IOException.class ./java/io/PrintStream.class ./java/io/FilterOutputStream.class ./java/io/OutputStream.class ./java/io/ObjectOutputStream.class ./gnu/java/lang/reflect/TypeSignature.class ./java/lang/reflect/Constructor.class ./java/lang/reflect/InvocationTargetException.class ./java/io/PrintWriter.class ./java/io/Writer.class ./gnu/vm/stack/StackTrace.class ./gnu/vm/stack/StackFrame.class ./java/lang/reflect/Method.class ./java/lang/Object.class ./java/lang/System.class ./java/lang/SecurityManager.class ./java/lang/SecurityContext.class ./java/lang/Class.class ./java/lang/ClassNotFoundException.class ./java/util/Vector.class ./java/util/Hashtable.class ./java/io/InputStream.class ./java/io/ObjectInput.class ./java/io/DataInput.class ./java/io/EOFException.class ./java/io/StreamCorruptedException.class ./java/io/ObjectStreamException.class ./java/io/DataInputStream.class ./java/io/FilterInputStream.class ./java/io/BlockDataException.class ./java/io/ObjectStreamClass.class ./java/io/InterfaceComparator.class ./java/io/MemberComparator.class ./java/io/ObjectStreamField.class ./java/io/NotSerializableException.class ./java/io/Externalizable.class ./java/io/WriteAbortedException.class ./java/io/NotActiveException.class ./java/io/ObjectInputValidation.class ./java/io/InvalidObjectException.class ./java/io/OptionalDataException.class ./gnu/java/io/EncodingManager.class ./gnu/java/io/decode/Decoder.class ./java/io/CharConversionException.class ./java/lang/NullPointerException.class ./java/lang/StringBuffer.class ./java/lang/NegativeArraySizeException.class ./java/lang/IndexOutOfBoundsException.class ./java/lang/StringIndexOutOfBoundsException.class ./java/lang/Error.class ./java/io/UnsupportedEncodingException.class ./java/lang/Math.class ./java/lang/Integer.class ./java/lang/VMClassLoader.class ./java/lang/ClassLoader.class ./java/lang/SecurityException.class ./java/lang/Long.class ./java/lang/Float.class ./java/lang/Double.class ./java/util/Properties.class ./java/util/ResourceBundle.class ./java/io/ObjectOutput.class ./java/io/DataOutput.class ./java/io/DataOutputStream.class ./java/io/OutputStreamWriter.class ./gnu/java/io/encode/Encoder.class ./java/lang/CloneNotSupportedException.class ./java/lang/VMObject.class ./java/lang/IllegalMonitorStateException.class ./java/lang/InterruptedException.class ./java/lang/VMSystem.class ./java/io/FileInputStream.class ./java/io/FileNotFoundException.class ./java/io/FileDescriptor.class ./java/io/SyncFailedException.class ./java/io/FileOutputStream.class ./java/lang/Runtime.class ./java/lang/VMSecurityManager.class ./java/lang/Thread.class ./java/lang/ThreadGroup.class ./java/lang/ThreadDeath.class ./java/net/InetAddress.class ./java/lang/InstantiationException.class ./java/lang/IllegalAccessException.class ./java/lang/IllegalArgumentException.class ./java/lang/UnknownError.class ./java/lang/VirtualMachineError.class ./java/lang/NoSuchMethodException.class ./java/net/URL.class ./gnu/java/lang/ClassHelper.class ./java/lang/NoSuchFieldException.class ./java/util/Collections.class ./java/util/AbstractSet.class ./java/util/Bucket.class ./java/util/BasicMapEntry.class ./java/io/UTFDataFormatException.class ./java/io/PushbackInputStream.class ./gnu/java/io/NullOutputStream.class ./java/lang/Comparable.class ./java/io/Reader.class ./java/lang/NumberFormatException.class ./java/lang/ClassFormatError.class ./java/lang/LinkageError.class ./java/net/MalformedURLException.class ./java/io/BufferedReader.class ./java/io/InputStreamReader.class ./java/util/Date.class ./java/util/GregorianCalendar.class ./java/util/Calendar.class ./java/util/PropertyResourceBundle.class ./java/io/ByteArrayOutputStream.class ./java/io/File.class ./java/lang/UnsatisfiedLinkError.class ./java/lang/Process.class ./java/lang/IllegalThreadStateException.class ./java/net/UnknownHostException.class ./java/net/URLStreamHandlerFactory.class ./java/net/URLStreamHandler.class ./java/net/URLConnection.class ./java/util/AbstractSequentialList.class ./java/util/TimeZone.class ./java/util/SimpleTimeZone.class ./java/io/FilenameFilter.class ./java/io/FileFilter.class ./java/net/MimeTypeMapper.class ./java/net/ContentHandlerFactory.class ./java/net/ContentHandler.class ./java/net/UnknownServiceException.class 
 
 
-# Rules for gnu.test.Fail
-#
-./gnu/test/Fail.class: ../gnu/test/Fail.java
-	$(JAVAC) ../gnu/test/Fail.java
-
-./gnu/test/Fail.class: ./gnu/test/Result.class
-
-
 # Rules for java.io.FilterReader
 #
 ./java/io/FilterReader.class: ../java/io/FilterReader.java
@@ -1148,22 +1126,6 @@
 ./java/security/interfaces/DSAKeyPairGenerator.class: ./java/security/interfaces/DSAParams.class
 
 
-# Rules for gnu.test.Untested
-#
-./gnu/test/Untested.class: ../gnu/test/Untested.java
-	$(JAVAC) ../gnu/test/Untested.java
-
-./gnu/test/Untested.class: ./gnu/test/Result.class
-
-
-# Rules for gnu.test.Pass
-#
-./gnu/test/Pass.class: ../gnu/test/Pass.java
-	$(JAVAC) ../gnu/test/Pass.java
-
-./gnu/test/Pass.class: ./gnu/test/Result.class
-
-
 # Rules for java.io.InvalidClassException
 #
 ./java/io/InvalidClassException.class: ../java/io/InvalidClassException.java
@@ -2066,14 +2028,6 @@
 ./gnu/java/lang/ClassLoaderHelper.class: ./java/util/StringTokenizer.class
 
 
-# Rules for gnu.test.Unsupported
-#
-./gnu/test/Unsupported.class: ../gnu/test/Unsupported.java
-	$(JAVAC) ../gnu/test/Unsupported.java
-
-./gnu/test/Unsupported.class: ./gnu/test/Result.class
-
-
 # Rules for java.lang.InternalError
 #
 ./java/lang/InternalError.class: ../java/lang/InternalError.java
@@ -2334,22 +2288,6 @@
 ./gnu/java/awt/peer/gtk/GtkMainThread.class: ./gnu/java/awt/peer/gtk/GtkGenericPeer.class
 
 
-# Rules for gnu.test.Test
-#
-./gnu/test/Test.class: ../gnu/test/Test.java
-	$(JAVAC) ../gnu/test/Test.java
-
-./gnu/test/Test.class: ./gnu/test/Result.class
-
-
-# Rules for gnu.test.XFail
-#
-./gnu/test/XFail.class: ../gnu/test/XFail.java
-	$(JAVAC) ../gnu/test/XFail.java
-
-./gnu/test/XFail.class: ./gnu/test/Result.class
-
-
 # Rules for java.lang.ArrayIndexOutOfBoundsException
 #
 ./java/lang/ArrayIndexOutOfBoundsException.class: ../java/lang/ArrayIndexOutOfBoundsException.java
@@ -2358,14 +2296,6 @@
 ./java/lang/ArrayIndexOutOfBoundsException.class: ./java/lang/Exception.class ./java/lang/Throwable.class ./java/io/ObjectInputStream.class ./java/io/ValidatorAndPriority.class ./java/util/Arrays.class ./java/util/AbstractList.class ./java/util/AbstractCollection.class ./java/lang/UnsupportedOperationException.class ./java/lang/RuntimeException.class ./java/lang/String.class ./java/util/Locale.class ./java/io/IOException.class ./java/io/PrintStream.class ./java/io/FilterOutputStream.class ./java/io/OutputStream.class ./java/io/ObjectOutputStream.class ./gnu/java/lang/reflect/TypeSignature.class ./java/lang/reflect/Constructor.class ./java/lang/reflect/InvocationTargetException.class ./java/io/PrintWriter.class ./java/io/Writer.class ./gnu/vm/stack/StackTrace.class ./gnu/vm/stack/StackFrame.class ./java/lang/reflect/Method.class ./java/lang/Object.class ./java/lang/System.class ./java/lang/SecurityManager.class ./java/lang/SecurityContext.class ./java/lang/Class.class ./java/lang/ClassNotFoundException.class ./java/util/Vector.class ./java/util/Hashtable.class ./java/io/InputStream.class ./java/io/ObjectInput.class ./java/io/DataInput.class ./java/io/EOFException.class ./java/io/StreamCorruptedException.class ./java/io/ObjectStreamException.class ./java/io/DataInputStream.class ./java/io/FilterInputStream.class ./java/io/BlockDataException.class ./java/io/ObjectStreamClass.class ./java/io/InterfaceComparator.class ./java/io/MemberComparator.class ./java/io/ObjectStreamField.class ./java/io/NotSerializableException.class ./java/io/Externalizable.class ./java/io/WriteAbortedException.class ./java/io/NotActiveException.class ./java/io/ObjectInputValidation.class ./java/io/InvalidObjectException.class ./java/io/OptionalDataException.class ./gnu/java/io/EncodingManager.class ./gnu/java/io/decode/Decoder.class ./java/io/CharConversionException.class ./java/lang/NullPointerException.class ./java/lang/StringBuffer.class ./java/lang/NegativeArraySizeException.class ./java/lang/IndexOutOfBoundsException.class ./java/lang/StringIndexOutOfBoundsException.class ./java/lang/Error.class ./java/io/UnsupportedEncodingException.class ./java/lang/Math.class ./java/lang/Integer.class ./java/lang/VMClassLoader.class ./java/lang/ClassLoader.class ./java/lang/SecurityException.class ./java/lang/Long.class ./java/lang/Float.class ./java/lang/Double.class ./java/util/Properties.class ./java/util/ResourceBundle.class ./java/io/ObjectOutput.class ./java/io/DataOutput.class ./java/io/DataOutputStream.class ./java/io/OutputStreamWriter.class ./gnu/java/io/encode/Encoder.class ./java/lang/CloneNotSupportedException.class ./java/lang/VMObject.class ./java/lang/IllegalMonitorStateException.class ./java/lang/InterruptedException.class ./java/lang/VMSystem.class ./java/io/FileInputStream.class ./java/io/FileNotFoundException.class ./java/io/FileDescriptor.class ./java/io/SyncFailedException.class ./java/io/FileOutputStream.class ./java/lang/Runtime.class ./java/lang/VMSecurityManager.class ./java/lang/Thread.class ./java/lang/ThreadGroup.class ./java/lang/ThreadDeath.class ./java/net/InetAddress.class ./java/lang/InstantiationException.class ./java/lang/IllegalAccessException.class ./java/lang/IllegalArgumentException.class ./java/lang/UnknownError.class ./java/lang/VirtualMachineError.class ./java/lang/NoSuchMethodException.class ./java/net/URL.class ./gnu/java/lang/ClassHelper.class ./java/lang/NoSuchFieldException.class ./java/util/Collections.class ./java/util/AbstractSet.class ./java/util/Bucket.class ./java/util/BasicMapEntry.class ./java/io/UTFDataFormatException.class ./java/io/PushbackInputStream.class ./gnu/java/io/NullOutputStream.class ./java/lang/Comparable.class ./java/io/Reader.class ./java/lang/NumberFormatException.class ./java/lang/ClassFormatError.class ./java/lang/LinkageError.class ./java/net/MalformedURLException.class ./java/io/BufferedReader.class ./java/io/InputStreamReader.class ./java/util/Date.class ./java/util/GregorianCalendar.class ./java/util/Calendar.class ./java/util/PropertyResourceBundle.class ./java/io/ByteArrayOutputStream.class ./java/io/File.class ./java/lang/UnsatisfiedLinkError.class ./java/lang/Process.class ./java/lang/IllegalThreadStateException.class ./java/net/UnknownHostException.class ./java/net/URLStreamHandlerFactory.class ./java/net/URLStreamHandler.class ./java/net/URLConnection.class ./java/util/AbstractSequentialList.class ./java/util/TimeZone.class ./java/util/SimpleTimeZone.class ./java/io/FilenameFilter.class ./java/io/FileFilter.class ./java/net/MimeTypeMapper.class ./java/net/ContentHandlerFactory.class ./java/net/ContentHandler.class ./java/net/UnknownServiceException.class 
 
 
-# Rules for gnu.test.Unresolved
-#
-./gnu/test/Unresolved.class: ../gnu/test/Unresolved.java
-	$(JAVAC) ../gnu/test/Unresolved.java
-
-./gnu/test/Unresolved.class: ./gnu/test/Result.class
-
-
 # Rules for java.io.FilePermission
 #
 ./java/io/FilePermission.class: ../java/io/FilePermission.java
@@ -2492,8 +2422,6 @@ CLASSES =  \
 	./java/lang/Exception.class ./java/lang/Throwable.class ./java/io/ObjectInputStream.class ./java/io/ValidatorAndPriority.class ./java/util/Arrays.class ./java/util/AbstractList.class ./java/util/AbstractCollection.class ./java/lang/UnsupportedOperationException.class ./java/lang/RuntimeException.class ./java/lang/String.class ./java/util/Locale.class ./java/io/IOException.class ./java/io/PrintStream.class ./java/io/FilterOutputStream.class ./java/io/OutputStream.class ./java/io/ObjectOutputStream.class ./gnu/java/lang/reflect/TypeSignature.class ./java/lang/reflect/Constructor.class ./java/lang/reflect/InvocationTargetException.class ./java/io/PrintWriter.class ./java/io/Writer.class ./gnu/vm/stack/StackTrace.class ./gnu/vm/stack/StackFrame.class ./java/lang/reflect/Method.class ./java/lang/Object.class ./java/lang/System.class ./java/lang/SecurityManager.class ./java/lang/SecurityContext.class ./java/lang/Class.class ./java/lang/ClassNotFoundException.class ./java/util/Vector.class ./java/util/Hashtable.class ./java/io/InputStream.class ./java/io/ObjectInput.class ./java/io/DataInput.class ./java/io/EOFException.class ./java/io/StreamCorruptedException.class ./java/io/ObjectStreamException.class ./java/io/DataInputStream.class ./java/io/FilterInputStream.class ./java/io/BlockDataException.class ./java/io/ObjectStreamClass.class ./java/io/InterfaceComparator.class ./java/io/MemberComparator.class ./java/io/ObjectStreamField.class ./java/io/NotSerializableException.class ./java/io/Externalizable.class ./java/io/WriteAbortedException.class ./java/io/NotActiveException.class ./java/io/ObjectInputValidation.class ./java/io/InvalidObjectException.class ./java/io/OptionalDataException.class ./gnu/java/io/EncodingManager.class ./gnu/java/io/decode/Decoder.class ./java/io/CharConversionException.class ./java/lang/NullPointerException.class ./java/lang/StringBuffer.class ./java/lang/NegativeArraySizeException.class ./java/lang/IndexOutOfBoundsException.class ./java/lang/StringIndexOutOfBoundsException.class ./java/lang/Error.class ./java/io/UnsupportedEncodingException.class ./java/lang/Math.class ./java/lang/Integer.class ./java/lang/VMClassLoader.class ./java/lang/ClassLoader.class ./java/lang/SecurityException.class ./java/lang/Long.class ./java/lang/Float.class ./java/lang/Double.class ./java/util/Properties.class ./java/util/ResourceBundle.class ./java/io/ObjectOutput.class ./java/io/DataOutput.class ./java/io/DataOutputStream.class ./java/io/OutputStreamWriter.class ./gnu/java/io/encode/Encoder.class ./java/lang/CloneNotSupportedException.class ./java/lang/VMObject.class ./java/lang/IllegalMonitorStateException.class ./java/lang/InterruptedException.class ./java/lang/VMSystem.class ./java/io/FileInputStream.class ./java/io/FileNotFoundException.class ./java/io/FileDescriptor.class ./java/io/SyncFailedException.class ./java/io/FileOutputStream.class ./java/lang/Runtime.class ./java/lang/VMSecurityManager.class ./java/lang/Thread.class ./java/lang/ThreadGroup.class ./java/lang/ThreadDeath.class ./java/net/InetAddress.class ./java/lang/InstantiationException.class ./java/lang/IllegalAccessException.class ./java/lang/IllegalArgumentException.class ./java/lang/UnknownError.class ./java/lang/VirtualMachineError.class ./java/lang/NoSuchMethodException.class ./java/net/URL.class ./gnu/java/lang/ClassHelper.class ./java/lang/NoSuchFieldException.class ./java/util/Collections.class ./java/util/AbstractSet.class ./java/util/Bucket.class ./java/util/BasicMapEntry.class ./java/io/UTFDataFormatException.class ./java/io/PushbackInputStream.class ./gnu/java/io/NullOutputStream.class ./java/lang/Comparable.class ./java/io/Reader.class ./java/lang/NumberFormatException.class ./java/lang/ClassFormatError.class ./java/lang/LinkageError.class ./java/net/MalformedURLException.class ./java/io/BufferedReader.class ./java/io/InputStreamReader.class ./java/util/Date.class ./java/util/GregorianCalendar.class ./java/util/Calendar.class ./java/util/PropertyResourceBundle.class ./java/io/ByteArrayOutputStream.class ./java/io/File.class ./java/lang/UnsatisfiedLinkError.class ./java/lang/Process.class ./java/lang/IllegalThreadStateException.class ./java/net/UnknownHostException.class ./java/net/URLStreamHandlerFactory.class ./java/net/URLStreamHandler.class ./java/net/URLConnection.class ./java/util/AbstractSequentialList.class ./java/util/TimeZone.class ./java/util/SimpleTimeZone.class ./java/io/FilenameFilter.class ./java/io/FileFilter.class ./java/net/MimeTypeMapper.class ./java/net/ContentHandlerFactory.class ./java/net/ContentHandler.class ./java/net/UnknownServiceException.class  \
 	./java/security/acl/NotOwnerException.class \
 	./java/security/UnrecoverableKeyException.class \
-	./gnu/test/Result.class \
-	./gnu/test/XPass.class \
 	./gnu/java/awt/peer/gtk/GtkGenericPeer.class \
 	./gnu/java/awt/peer/gtk/GtkComponentPeer.class \
 	./gnu/java/awt/peer/gtk/GtkContainerPeer.class \
@@ -2563,7 +2491,6 @@ CLASSES =  \
 	./gnu/java/io/decode/Decoder8859_1.class \
 	./java/beans/Visibility.class \
 	./java/security/Provider.class \
-	./gnu/test/Fail.class \
 	./java/io/FilterReader.class \
 	./java/io/PushbackReader.class \
 	./java/io/LineNumberReader.class \
@@ -2573,8 +2500,6 @@ CLASSES =  \
 	./gnu/java/beans/ExplicitBeanInfo.class \
 	./gnu/java/beans/BeanInfoEmbryo.class \
 	./java/security/interfaces/DSAKeyPairGenerator.class \
-	./gnu/test/Untested.class \
-	./gnu/test/Pass.class \
 	./java/io/InvalidClassException.class \
 	./java/security/acl/Permission.class \
 	./gnu/java/lang/MainThread.class \
@@ -2664,7 +2589,6 @@ CLASSES =  \
 	./java/security/Key.class \
 	./java/security/NoSuchProviderException.class \
 	./gnu/java/lang/ClassLoaderHelper.class \
-	./gnu/test/Unsupported.class \
 	./java/lang/InternalError.class \
 	./java/io/ByteArrayInputStream.class \
 	./gnu/java/net/protocol/file/Handler.class \
@@ -2693,10 +2617,7 @@ CLASSES =  \
 	./gnu/java/net/content/text/plain.class \
 	./java/lang/OutOfMemoryError.class \
 	./gnu/java/awt/peer/gtk/GtkMainThread.class \
-	./gnu/test/Test.class \
-	./gnu/test/XFail.class \
 	./java/lang/ArrayIndexOutOfBoundsException.class \
-	./gnu/test/Unresolved.class \
 	./java/io/FilePermission.class \
 	./java/security/DigestException.class \
 	./java/lang/ArrayStoreException.class \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 11d9b03f7..c8124ef4f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -30,4 +30,4 @@ endif
 glibj.zip: $(CLASSES)
 	zip -r -D -0 glibj.zip gnu java
 
-EXTRA_DIST = glibj.zip
+EXTRA_DIST = glibj.zip .deps
diff --git a/lib/standard.omit b/lib/standard.omit
index 59682b1aa..d4216fef1 100644
--- a/lib/standard.omit
+++ b/lib/standard.omit
@@ -7,3 +7,4 @@
 ^../java/text/.*$
 ^../gnu/java/awt/peer/gtk/GtkToolkit.java$
 ^../gnu/java/awt/peer/gtk/Test.java$
+^../gnu/test/.*$