summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUGS2
-rw-r--r--ChangeLog43
-rw-r--r--HACKING6
-rw-r--r--INSTALL26
-rw-r--r--NEWS13
-rw-r--r--README7
-rw-r--r--THANKYOU1
-rw-r--r--TODO55
-rw-r--r--configure.in29
-rw-r--r--doc/www.gnu.org/announce/announcements.wml2
-rw-r--r--doc/www.gnu.org/home.wml88
-rw-r--r--doc/www.gnu.org/include/macros.wml12
-rw-r--r--gnu/java/awt/peer/gtk/Makefile.am3
-rw-r--r--gnu/java/locale/Makefile.am3
-rw-r--r--java/awt/Makefile.am17
-rw-r--r--java/net/Makefile.am2
-rw-r--r--java/util/Makefile.am3
-rw-r--r--java/util/logging/Makefile.am21
-rw-r--r--java/util/regex/.cvsignore2
-rw-r--r--java/util/regex/Makefile.am7
-rw-r--r--java/util/zip/Makefile.am1
-rw-r--r--javax/accessibility/Makefile.am1
-rw-r--r--javax/swing/Makefile.am5
-rw-r--r--javax/swing/plaf/Makefile.am2
-rw-r--r--javax/swing/table/Makefile.am3
-rw-r--r--native/Makefile.am2
-rw-r--r--native/jni/Makefile.am7
27 files changed, 214 insertions, 149 deletions
diff --git a/BUGS b/BUGS
index 967f77ad2..ba54d36b0 100644
--- a/BUGS
+++ b/BUGS
@@ -2,4 +2,4 @@ This package is still in the early development phase. That means too
early to start listing bugs in a file like this one!
Report bugs to classpath@gnu.org or much better via Savannah at this
-URL: http://savannah.gnu.org/support/?func=addsupport&group_id=85
+URL: http://savannah.gnu.org/bugs/?group_id=85
diff --git a/ChangeLog b/ChangeLog
index 3d9c2e145..04d8dd55a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2002-05-05 C. Brian Jones <cbj@gnu.org>
+
+ * doc/www.gnu.org/home.wml: Announcements section removed; we use
+ the News section of Savannah instead. Old announcements linked
+ under documentation.
+ Status information will be transitioning to Savannah Tasks system.
+ Clarified affect of Classpath license upon JVM license.
+ Added project menu bar from Savannah to top of web page.
+ Removed mailing list information on this page, it is more detailed
+ on the Lists link at the top of the page.
+ Last modified author update
+ * doc/www.gnu.org/announce/announcements.wml: last modified author
+ * doc/www.gnu.org/include/macros.wml (header): Moved title to
+ the right of droplet and enlarged text.
+ Updated copyright date.
+ * BUGS: update URL for submitting bugs
+ * HACKING: update date; clarify via punctuation modification of
+ vm/reference classes.
+ * configure.in: added --enable-gtk-peer from Carlos Cavanna
+ Updated version to 0.04; configure java/util/logging, java/util/regex
+ * native/Makefile.am: SUBDIRS typo fixed
+ * native/jni/Makefile.am: SUBDIRS conditionally defined based on
+ --enable-gtk-peer
+ * INSTALL: update with mention of --enable-gtk-peer, typo fixed
+ * NEWS: updated for 0.04 release
+ * README: updated with AegisVM, note failure to run with ORP 1.0.9
+ * TODO: removed duplicate information on where packages currently
+ stand, too hard to keep up to date in multiple places.
+ * THANKYOU: add Carlos Cavanna
+ * java/util/logging/Makefile.am: new file
+ * java/util/regex/Makefile.am: new file
+ * java/util/regex/.cvsignore: new file
+ * gnu/java/awt/peer/gtk/Makefile.am: EXTRA_DIST updated
+ * gnu/java/locale/Makefile.am: ditto
+ * java/awt/Makefile.am: ditto
+ * java/net/Makefile.am: ditto
+ * java/util/Makefile.am: ditto
+ * java/util/zip/Makefile.am: ditto
+ * javax/accessibility/Makefile.am: ditto
+ * javax/swing/Makefile.am: ditto
+ * javax/swing/plaf/Makefile.am: ditto
+ * javax/swing/table/Makefile.am: ditto
+
2002-05-05 Eric Blake <ebb9@email.byu.edu>
* java/applet/Applet.java (getAccessibleState): Update.
diff --git a/HACKING b/HACKING
index b78fd26c8..00d51bcef 100644
--- a/HACKING
+++ b/HACKING
@@ -1,4 +1,4 @@
-HACKING GNU Classpath - Last updated: Feb 09, 2002
+HACKING GNU Classpath - Last updated: May 05, 2002
Please read the README and INSTALL files first.
You only need the information in this file when working on non-released (CVS)
@@ -18,7 +18,7 @@ autoconf, automake, and libtool are required.
For building the Java bytecode (.class files), one of these compilers
is required.
- - GNU GCJ 3.0.2+.
+ - GNU GCJ 3.1+.
- IBM jikes 1.15b+. Until jikes 1.16 is released, you will
have to use CVS access and build jikes 1.15b yourself:
cvs -d :pserver:anoncvs@www-124.ibm.com:/usr/cvs/jikes login
@@ -62,7 +62,7 @@ may include --enable-jni.
By default the core classes are compiled using vm/reference JVM specific
classes. As a VM writer you may take these reference classes and modify
-them as you wish as long as the public interface remains the same and
+them as you wish. As long as the public interface remains the same
no modifications to other core parts of Classpath should be needed.
Gnome cvs can be obtained with
diff --git a/INSTALL b/INSTALL
index 5db9abf74..840692971 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-Installing GNU Classpath - Last updated: Feb. 09, 2002
+Installing GNU Classpath - Last updated: May. 05, 2002
First, this is a development release only! Unless you are interested in
active development and debugging, or just like running random alpha code,
@@ -9,7 +9,9 @@ list of VMs that work with GNU Classpath.
Suggested Software
------------------------------------------------------------------
For any build environment involving native libraries, these
- new versions of autoconf, automake, and libtool are required.
+ new versions of autoconf, automake, and libtool are required
+ if changes are made that require rebuilding configure, Makefile.in,
+ aclocal.m4, or config.h.in.
- GNU autoconf 2.52
- GNU automake 1.5
@@ -22,12 +24,13 @@ Suggested Software
included in any of Sun's JDKs will not work, as it will not
compile java.lang.Object.
- - GCJ 3.0.2+ (part of the GNU GCC package). Note that GCC
- 3.1 (from CVS) is currently broken, if you do want to use it
+ - GCJ 3.1+ (part of the GNU GCC package). Note that GCC
+ 3.1 (from CVS) is currently unreleased. If you do want to use it
look at the status of the following bug:
<http://gcc.gnu.org/cgi-bin/gnatsweb.pl?cmd=view&database=gcc&pr=4715>
Applying the patch in that report to gcc/jva/parse.y does
- seem to solve/work around the problem.
+ seem to solve/work around the problem. It may not be needed
+ for GCJ 3.1 however.
- IBM jikes 1.15b+. You may have success with 1.13, but other
versions will fail. Until jikes 1.16 is released, you will
have to use CVS access and build jikes 1.15b yourself:
@@ -37,7 +40,8 @@ Suggested Software
- The kjc compiler is supported with configure but we have
been unable to successfully compile with it.
- For building the JNI native libraries, the following are required.
+ For building the JNI native libraries, the following are required
+ unless --disable-gtk-peer is used as an argument to configure.
- GTK+ 1.2.x
- libart_lgpl 2.1.0
@@ -54,6 +58,7 @@ gives a complete list.
--enable-java compile Java source default=yes
--enable-jni compile JNI source default=no
--enable-cni compile CNI source default=no
+ --enable-gtk-peer compile GTK native peers default=yes
--enable-load-library enable to use JNI native methods default=yes
(disabled automatically using --enable-cni)
@@ -96,10 +101,9 @@ compilation of a particular class file and leave this up to the Java
compiler instead.
The --enable-maintainer-mode option to configure currently does very
-little and shouldn't be used by ordinary develoeprs or users anyway.
+little and shouldn't be used by ordinary developers or users anyway.
On Windows machines, the native libraries do not currently build, but
-the Java bytecode library will. Unfortunately, as gcj does not yet
-compile under cygwin or mingw32, and the mingw32 version of jikes
-cannot follow symbolic links, you must use a cygwin build of jikes to
-access this limited functionality.
+the Java bytecode library will. Gcj trunk is beginning to work under
+Cygwin. The mingw32 version of jikes cannot follow symbolic links, you
+must use a cygwin build of jikes to access this limited functionality.
diff --git a/NEWS b/NEWS
index 612aa6091..2cec43a10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,15 @@
-New in release 0.03 (TBD)
+New in release 0.04 (2002/05/05)
+* Additional configure options to disable zip creation and installation as
+ well as disable gtk peer native compilation.
+* Addition of java.nio, java.util.logging, and javax.swing.
+* Integration of most or all of the ORP patches to date, the purpose of
+ which are to make it possible to use JBOSS with ORP and Classpath. This
+ is still in a testing phase however.
+* Significant changes in the reference VM interface that may require
+ support from the JVMs.
+* Lots of bugfixes.
+
+New in release 0.03 (2002/02/08)
* More merges with libgcj have been performed including java.math which now
provides a pure Java implementation of that package.
Current status at <http://gcc.gnu.org/java/libgcj-classpath-compare.html>
diff --git a/README b/README
index 3ff53b8a2..7852546b1 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-GNU Classpath README - Last updated: Feb 07, 2002
+GNU Classpath README - Last updated: May 05, 2002
GNU Classpath, Essential Libraries for Java is a project to create
a complete "clean room" implementation of the Java class libraries
@@ -16,12 +16,13 @@ include:
* SableVM (http://www.sablevm.org/)
* Jupiter (http://www.eecg.toronto.edu/~doylep/jupiter/)
* Joas (http://www.oberon.ethz.ch/jaos/)
+ * AegisVM (http://aegisvm.sourceforge.net/)
This is a development release only and is not ready for general
purpose use.
-GNU Classpath has been tested to work out of the box with the latest ORP
-release. Instructions for building ORP with this GNU Classpath release can
+GNU Classpath has been tested NOT to work out of the box with ORP 1.0.9.
+Instructions for building ORP with this GNU Classpath release can
be found at <http://www.gnu.org/software/classpath/doc/orp.html>.
Most JVMs come with their own customized version of GNU Classpath.
Please check if there is a customised version available for the JVM you
diff --git a/THANKYOU b/THANKYOU
index 1f5ce56ba..092534b52 100644
--- a/THANKYOU
+++ b/THANKYOU
@@ -8,6 +8,7 @@ C. Scott Ananian (cananian@lesser-magoo.lcs.mit.edu)
Xuan Baldauf (entwicklung--classpath--gnu.org@medium.net)
Artur Biesiadowski (abies@pg.gda.pl)
Per Bothner (per@bothner.com)
+Carlos Cavanna (cdcavanna@yahoo.com)
Stephen Crawley (crawley@dstc.edu.au)
Moses DeJong (dejong@cs.umn.edu)
Patrick Doyle (doylep@eecg.toronto.edu)
diff --git a/TODO b/TODO
index d59c8aeaf..8c7652c26 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-The Classpath TODO list as of 2001/11/03
+The Classpath TODO list as of 2002/05/05
-- Modify Classpath build to support libgcj out of the box. Ideally
the gcj folks could simply include a stock classpath in one of their
@@ -30,58 +30,7 @@ The Classpath TODO list as of 2001/11/03
-- Write Mauve (http://sourceware.cygnus.com/mauve/) tests for those
classes that don't have them.
--------------------------------------------------------------------------
-
-Here is what needs to be done on a package by package basis for Java
-1.1 compatibility. Note that debugging should be done by running
-Mauve tests against Classpath where possible. If Mauve tests don't
-exist, the first step is to write them. Note that while I say "1.1",
-the implementations of these packages should be written to the "1.2"
-standard.
-
--- java.applet: Coded and compiles cleanly. Needs debugging.
-
--- java.awt: Mostly done and compiles cleanly. A few classes are
- missing. Needs to be debugged and integrated with Paul Fisher's
- AWT peers.
-
--- java.awt.datatransfer: Coded and compiles cleanly. Needs
- debugging. This task should be considered "On Hold" for now.
-
--- java.awt.event: Coded and compiles cleanly. Needs debugging.
- This task should be considered "On Hold" for now.
-
--- java.awt.image: Partially implemented, could use help with identifying
- the proper image manipulation algorithms that need to be implemented.
-
--- java.awt.peer: Done. Nothing needs to be done here.
-
--- java.beans: Done. Additional testing/debugging/real life use
- reports would be helpful, as would efficieny improvements.
-
--- java.io: Needs to be merged with libgcj. See above.
-
--- java.lang: Needs to be merged with libgcj. See above.
-
--- java.math: Done.
-
--- java.net: Needs to be merged with libgcj. See above.
-
--- java.rmi: Done.
-
--- java.security: Debug the implementation.
-
--- java.sql: Needs debugging.
-
--- java.text: Needs to be merged with libgcj. See above.
-
--- java.util: Needs to be merged with libgcj. See above
-
--- java.util.zip: Need to be merged with libgcj. See above.
-
--------------------------------------------------------------------------
-
--- Write Java 1.2 packages not currently included or improve existing
+-- Write Java 2 packages not currently included or improve existing
ones.
-- Figure out an easy method of generating online Javadocs from our
diff --git a/configure.in b/configure.in
index 2791feeaf..c100e7494 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ AC_CANONICAL_TARGET
if expr match ${target_cpu} .*86 > /dev/null; then target_cpu=x86; fi
PACKAGE="classpath"
-VERSION="0.03"
+VERSION="0.04"
LIBVERSION="0:0:0"
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
@@ -55,9 +55,22 @@ AC_ARG_ENABLE(cni,
esac],
[COMPILE_CNI=no])
+dnl -----------------------------------------------------------
+dnl GTK native peer
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE(gtk-peer,
+[ --enable-gtk-peer compile GTK native peers [default=yes]],
+[case "${enableval}" in
+ yes) COMPILE_GTK_PEER=yes ;;
+ no) COMPILE_GTK_PEER=no ;;
+ *) COMPILE_GTK_PEER=yes ;;
+esac],
+[COMPILE_GTK_PEER=yes])
+
AM_CONDITIONAL(CREATE_JNI_HEADERS, test "x${COMPILE_JNI}" = xyes)
AM_CONDITIONAL(CREATE_JNI_LIBRARIES, test "x${COMPILE_JNI}" = xyes)
AM_CONDITIONAL(CREATE_CNI_LIBRARIES, test "x${COMPILE_CNI}" = xyes)
+AM_CONDITIONAL(CREATE_GTK_PEER_LIBRARIES, test "x${COMPILE_GTK_PEER}" = xyes)
AC_PROG_LN_S
AC_PROG_INSTALL
@@ -108,12 +121,14 @@ if test "x${COMPILE_JNI}" = xyes; then
fi
dnl Check for AWT related glib/gtk/libart_lgpl
- AM_PATH_GTK(1.2.4,,exit 1)
- AM_PATH_GLIB(1.2.4,,exit 1,gthread)
+ if test "x${COMPILE_GTK_PEER}" = xyes; then
+ AM_PATH_GTK(1.2.4,,exit 1)
+ AM_PATH_GLIB(1.2.4,,exit 1,gthread)
+ dnl XXX Fix me when libart.m4 has the compile test fixed!
+ enable_libarttest=no
+ AM_PATH_LIBART(2.1.0,,exit 1)
+ fi
- dnl XXX Fix me when libart.m4 has the compile test fixed!
- enable_libarttest=no
- AM_PATH_LIBART(2.1.0,,exit 1)
fi
CLASSPATH_WITH_JAVAH
@@ -310,8 +325,10 @@ java/security/spec/Makefile
java/sql/Makefile
java/text/Makefile
java/util/Makefile
+java/util/logging/Makefile
java/util/jar/Makefile
java/util/prefs/Makefile
+java/util/regex/Makefile
java/util/zip/Makefile
javax/Makefile
javax/accessibility/Makefile
diff --git a/doc/www.gnu.org/announce/announcements.wml b/doc/www.gnu.org/announce/announcements.wml
index 0733b9993..6a7d015f8 100644
--- a/doc/www.gnu.org/announce/announcements.wml
+++ b/doc/www.gnu.org/announce/announcements.wml
@@ -8,7 +8,7 @@
<lang:new id=en short>
<lang:star:slice:>
-<set-var last-modified-author="mjw">
+<set-var last-modified-author="cbj">
#include <include/macros.wml>
diff --git a/doc/www.gnu.org/home.wml b/doc/www.gnu.org/home.wml
index 7ed99acb6..8afb6ccb5 100644
--- a/doc/www.gnu.org/home.wml
+++ b/doc/www.gnu.org/home.wml
@@ -8,13 +8,28 @@
<lang:new id=en short>
<lang:star:slice:>
-<set-var last-modified-author="<mjw>">
+<set-var last-modified-author="<cbj>">
#include <include/macros.wml>
<header title="GNU Classpath">
<en>
<p>
+<hr SIZE="1" NoShade>
+<a class=tabselect href="http://savannah.gnu.org/projects/classpath/">Savannah</a>&nbsp;|&nbsp;
+
+<a class=tabs href="http://www.gnu.org/software/classpath/">Homepage</a>&nbsp;|&nbsp;
+<a class=tabs href="http://savannah.gnu.org/bugs/?group_id=85">Bugs</a>&nbsp;|&nbsp;
+<a class=tabs href="http://savannah.gnu.org/support/?group_id=85">Support</a>&nbsp;|&nbsp;
+<a class=tabs href="http://savannah.gnu.org/patch/?group_id=85">Patches</a>&nbsp;|&nbsp;
+<a class=tabs href="http://savannah.gnu.org/mail/?group_id=85">Lists</a>&nbsp;|&nbsp;
+
+<a class=tabs href="http://savannah.gnu.org/pm/?group_id=85">Tasks</a>&nbsp;|&nbsp;
+<a class=tabs href="http://savannah.gnu.org/news/?group_id=85">News</a>&nbsp;|&nbsp;
+<a class=tabs href="http://savannah.gnu.org/cvs/?group_id=85">CVS</a>&nbsp;|&nbsp;
+<a class=tabs href="http://savannah.gnu.org/files/?group_id=85">Files</a>&nbsp;|&nbsp;<hr SIZE="1" NoShade>
+
+<p>
GNU Classpath is a set of essential libraries for supporting the Java
language. Our goal is to provide a free replacement for Sun's
proprietary class libraries so that the GNU system can run programs
@@ -46,84 +61,43 @@ exception statement from your version.
<p>
As such, it can be used to run free as well as proprietary
-applications and applets.
+applications and applets. Using GNU Classpath as the class library
+for a Java virtual machine (JVM) does not affect the licensing of the
+JVM.
</p>
<p>
-Classpath is a work in progress. There have been no public releases;
-however, pre-release source code is available via GNU's anonymous CVS
-server, and snapshots of the Classpath tree have been released and are
+Classpath is still a work in progress. The first public release will
+be version 1.0. There have been no public releases; however, pre-release
+source code is available via GNU's anonymous
+<link url="http://savannah.gnu.org/cvs/?group_id=85" name="CVS server">
+, and snapshots of the Classpath tree have been released and are
available from <link url="ftp://alpha.gnu.org/gnu/classpath/"
name="ftp://alpha.gnu.org/gnu/classpath/">.
</p>
-<p>
-Directions for obtaining the source code through CVS are available
-at <link url="http://savannah.gnu.org/cvs/?group_id=85"
-name="http://savannah.gnu.org/cvs/?group_id=85">. These directions are
-for anonymous and developer access. Information about accessing CVS
-from behind a firewall is also available.
-</p>
-
-<p>
-Classpath has been converted to a <link url="http://savannah.gnu.org/"
-name="Savannah"> project. Our project page is <link
-url="http://savannah.gnu.org/projects/classpath/"
-name="http://savannah.gnu.org/projects/classpath/">. From there you
-can submit bug reports, check the latest news, find tasks yet to be
-done, and most importantly submit patches!
-</p>
-
</en>
-<H4>Announcements</H4>
-<UL>
- <LI><link url="announce/20020208.html"
- name="GNU Classpath Version 0.03"> (2002-02-08)</LI>
- <LI><link url="announce/20010106.html"
- name="GNU Classpath Version 0.02"> (2001-01-06)</LI>
- <LI><link url="announce/20001120.html"
- name="GNU Classpath Version 0.01"> (2000-11-20)</LI>
- <LI><link url="announce/19990206.html"
- name="GNU Classpath Version 0.00"> (1999-02-06)</LI>
-</UL>
-
<H4>Documentation</H4>
<UL>
<LI><link url="doc/orp.html" name="Using GNU
Classpath with ORP"></LI>
<LI><link url="doc/hacking.html"
name="GNU Classpath Hacker's Guide"></LI>
- <LI><link url="doc/vmintegration.html"
+ <LI><link url="doc/vmintegration.html"
name="Virtual Machine Integration Guide"></LI>
+ <LI><link url="announce/announcements.html"
+ name="Old News"></LI>
</UL>
-<H4><en>Mailing List</en></H4>
-<en>
-<p>
-There is one general discussion list for Classpath. You may
-<link url="http://mail.gnu.org/mailman/listinfo/classpath/" name="subscribe">
-to the mailing list via the web. However, you may also
-just send an email message with a subject of "subscribe"
-to <link url="mailto:classpath-request@gnu.org?subject=subscribe"
-name="&lt;classpath-request@gnu.org&gt;">. You may
-<link url="http://mail.gnu.org/mailman/listinfo/classpath/" name="unsubscribe">
-from the mailing list via the web as well. To send a message to the list,
-mail it to <link url="mailto:classpath@gnu.org" name="&lt;classpath@gnu.org&gt;">.
-An <link url="http://www.mail-archive.com/classpath%40gnu.org/" name="archive"> of
-the list is available which dates back to the beginning of the project.
-A new, but less comprehensive, archive of the mailing list is now located
-on <link url="http://mail.gnu.org/mailman/listinfo/classpath/" name="mail.gnu.org">.
-</p>
-</en>
-
<H4><en>Status</en></H4>
<p>
<en>
-We're aiming for GNU Classpath 1.0 to be fully compatible with Java
-1.1 and largely compatible with Java 1.2. Detailed information on the
+GNU Classpath 1.0 will be fully compatible with Java 1.1 and largely
+compatible with Java 2. Detailed information on the
current state of a package can be obtained by clicking on the
-appropriate link below.
+appropriate link below. This information will become part of the Savannah
+Tasks information in the future and no longer appear on this page.
</en>
</p>
<package-list>
diff --git a/doc/www.gnu.org/include/macros.wml b/doc/www.gnu.org/include/macros.wml
index 2d58cafdf..80d907984 100644
--- a/doc/www.gnu.org/include/macros.wml
+++ b/doc/www.gnu.org/include/macros.wml
@@ -7,7 +7,9 @@
<head>
<link rev="made" HREF="mailto:webmasters@www.gnu.org">
</head>
-<h3><en>GNU Classpath</en></h3>
+<table>
+<tr>
+<td>
<applet code="Animation.class" CODEBASE="/graphics" WIDTH="130" HEIGHT="86">
<param name="base-name" value="drop">
<param name="extension" value="jpg">
@@ -23,6 +25,12 @@
</a>
<a href="/philosophy/gif.html">no gifs due to patent problems</a>
</applet>
+</td>
+<td>
+<h1><en>GNU Classpath</en></h1>
+</td>
+</tr>
+</table>
<restore title>
</define-tag>
@@ -46,7 +54,7 @@ Please send comments on these web pages to
send other questions to
<A HREF="mailto:gnu@gnu.org"><EM>gnu@gnu.org</EM></A>.
<P>
-Copyright (C) 1999 Free Software Foundation, Inc.,
+Copyright (C) 1999-2002 Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111, USA
<P>
Verbatim copying and distribution of this entire article is
diff --git a/gnu/java/awt/peer/gtk/Makefile.am b/gnu/java/awt/peer/gtk/Makefile.am
index a35f76b33..565d00109 100644
--- a/gnu/java/awt/peer/gtk/Makefile.am
+++ b/gnu/java/awt/peer/gtk/Makefile.am
@@ -9,7 +9,6 @@ EXTRA_DIST = \
GtkCanvasPeer.java \
GtkCheckboxMenuItemPeer.java \
GtkCheckboxPeer.java \
- GtkCheckButtonPeer.java \
GtkChoicePeer.java \
GtkClipboard.java \
GtkComponentPeer.java \
@@ -31,12 +30,10 @@ EXTRA_DIST = \
GtkOffScreenImage.java \
GtkPanelPeer.java \
GtkPopupMenuPeer.java \
- GtkRadioButtonPeer.java \
GtkScrollbarPeer.java \
GtkScrollPanePeer.java \
GtkTextAreaPeer.java \
GtkTextComponentPeer.java \
GtkTextFieldPeer.java \
- GtkToggleButtonPeer.java \
GtkToolkit.java \
GtkWindowPeer.java
diff --git a/gnu/java/locale/Makefile.am b/gnu/java/locale/Makefile.am
index 912a14430..afada20a5 100644
--- a/gnu/java/locale/Makefile.am
+++ b/gnu/java/locale/Makefile.am
@@ -140,9 +140,6 @@ LocaleInformation_zh_CN.java \
LocaleInformation_zh_HK.java \
LocaleInformation_zh_SG.java \
LocaleInformation_zh_TW.java \
-block.uni \
-character.uni \
-titlecase.uni \
iso3166-a3.properties \
iso3166.properties \
iso3166_de.properties \
diff --git a/java/awt/Makefile.am b/java/awt/Makefile.am
index c3142315a..eaf9556e0 100644
--- a/java/awt/Makefile.am
+++ b/java/awt/Makefile.am
@@ -1,17 +1,21 @@
## Input file for automake
-SUBDIRS = color datatransfer event font geom im image peer print
+SUBDIRS = color datatransfer dnd event font geom im image peer print
EXTRA_DIST = \
ActiveEvent.java \
Adjustable.java \
+AlphaComposite.java \
+AttributeValue.java \
AWTError.java \
AWTEvent.java \
AWTEventMulticaster.java \
AWTException.java \
AWTKeyStroke.java \
AWTPermission.java \
+BasicStroke.java \
BorderLayout.java \
+BufferCapabilities.java \
Button.java \
Canvas.java \
CardLayout.java \
@@ -25,7 +29,10 @@ ComponentOrientation.java \
Composite.java \
CompositeContext.java \
Container.java \
+ContainerOrderFocusTraversalPolicy.java \
Cursor.java \
+DefaultFocusTraversalPolicy.java \
+DefaultKeyboardFocusManager.java \
Dialog.java \
Dimension.java \
DisplayMode.java \
@@ -34,10 +41,12 @@ Event.java \
EventQueue.java \
FileDialog.java \
FlowLayout.java \
+FocusTraversalPolicy.java \
Font.java \
FontFormatException.java \
FontMetrics.java \
Frame.java \
+GradientPaint.java \
Graphics2D.java \
GraphicsConfigTemplate.java \
GraphicsConfiguration.java \
@@ -49,8 +58,11 @@ GridLayout.java \
HeadlessException.java \
IllegalComponentStateException.java \
Image.java \
+ImageCapabilities.java \
Insets.java \
ItemSelectable.java \
+JobAttributes.java \
+KeyboardFocusManager.java \
KeyEventDispatcher.java \
KeyEventPostProcessor.java \
Label.java \
@@ -64,6 +76,7 @@ MenuContainer.java \
MenuItem.java \
Menu.java \
MenuShortcut.java \
+PageAttributes.java \
PaintContext.java \
Paint.java \
Panel.java \
@@ -74,6 +87,7 @@ PrintGraphics.java \
PrintJob.java \
Rectangle.java \
RenderingHints.java \
+Robot.java \
Scrollbar.java \
ScrollPaneAdjustable.java \
ScrollPane.java \
@@ -83,6 +97,7 @@ SystemColor.java \
TextArea.java \
TextComponent.java \
TextField.java \
+TexturePaint.java \
Toolkit.java \
Transparency.java \
Window.java
diff --git a/java/net/Makefile.am b/java/net/Makefile.am
index 686bbc3ce..db45a9135 100644
--- a/java/net/Makefile.am
+++ b/java/net/Makefile.am
@@ -14,6 +14,7 @@ DatagramSocket.java \
FileNameMap.java \
HttpURLConnection.java \
InetAddress.java \
+InetSocketAddress.java \
JarURLConnection.java \
MalformedURLException.java \
MimeTypeMapper.java \
@@ -26,6 +27,7 @@ PlainSocketImpl.java \
PortUnreachableException.java \
ProtocolException.java \
ServerSocket.java \
+SocketAddress.java \
Socket.java \
SocketException.java \
SocketImplFactory.java \
diff --git a/java/util/Makefile.am b/java/util/Makefile.am
index 3b1a8211d..8ff1c9bfd 100644
--- a/java/util/Makefile.am
+++ b/java/util/Makefile.am
@@ -1,6 +1,6 @@
## Input file for automake to generate the Makefile.in used by configure
-SUBDIRS = jar prefs zip
+SUBDIRS = logging jar prefs regex zip
EXTRA_DIST = \
AbstractCollection.java \
@@ -42,6 +42,7 @@ NoSuchElementException.java \
Observable.java \
Observer.java \
Properties.java \
+PropertyPermissionCollection.java \
PropertyPermission.java \
PropertyResourceBundle.java \
RandomAccess.java \
diff --git a/java/util/logging/Makefile.am b/java/util/logging/Makefile.am
new file mode 100644
index 000000000..f13fd7c2c
--- /dev/null
+++ b/java/util/logging/Makefile.am
@@ -0,0 +1,21 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+SUBDIRS =
+
+EXTRA_DIST = \
+ConsoleHandler.java \
+ErrorManager.java \
+FileHandler.java \
+Filter.java \
+Formatter.java \
+Handler.java \
+Level.java \
+Logger.java \
+LoggingPermission.java \
+LogManager.java \
+LogRecord.java \
+MemoryHandler.java \
+SimpleFormatter.java \
+SocketHandler.java \
+StreamHandler.java \
+XMLFormatter.java
diff --git a/java/util/regex/.cvsignore b/java/util/regex/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/java/util/regex/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/java/util/regex/Makefile.am b/java/util/regex/Makefile.am
new file mode 100644
index 000000000..62552d66f
--- /dev/null
+++ b/java/util/regex/Makefile.am
@@ -0,0 +1,7 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+SUBDIRS =
+
+EXTRA_DIST = \
+Matcher.java \
+Pattern.java
diff --git a/java/util/zip/Makefile.am b/java/util/zip/Makefile.am
index cadee3eb9..33bf4371c 100644
--- a/java/util/zip/Makefile.am
+++ b/java/util/zip/Makefile.am
@@ -13,7 +13,6 @@ DeflaterEngine.java \
DeflaterHuffman.java \
DeflaterOutputStream.java \
DeflaterPending.java \
-GZIPConstants.java \
GZIPInputStream.java \
GZIPOutputStream.java \
Inflater.java \
diff --git a/javax/accessibility/Makefile.am b/javax/accessibility/Makefile.am
index fbd2b0ebd..a155846d0 100644
--- a/javax/accessibility/Makefile.am
+++ b/javax/accessibility/Makefile.am
@@ -1,6 +1,7 @@
## Input file for automake
EXTRA_DIST = \
+package.html \
Accessible.java \
AccessibleAction.java \
AccessibleBundle.java \
diff --git a/javax/swing/Makefile.am b/javax/swing/Makefile.am
index 41883b20f..d113b5856 100644
--- a/javax/swing/Makefile.am
+++ b/javax/swing/Makefile.am
@@ -13,6 +13,7 @@ Box.java \
BoxLayout.java \
ButtonGroup.java \
ButtonModel.java \
+CellEditor.java \
ComponentInputMap.java \
DefaultButtonModel.java \
DefaultCellRenderer.java \
@@ -29,6 +30,7 @@ JComponent.java \
JDialog.java \
JEditorPane.java \
JFrame.java \
+JInternalFrame.java \
JLabel.java \
JLayeredPane.java \
JList.java \
@@ -40,6 +42,7 @@ JRootPane.java \
JScrollBar.java \
JScrollPane.java \
JTabbedPane.java \
+JTable.java \
JTextField.java \
JToggleButton.java \
JToolTip.java \
@@ -51,6 +54,8 @@ ListCellRenderer.java \
ListModel.java \
ListSelectionModel.java \
LookAndFeel.java \
+MenuElement.java \
+MenuSelectionManager.java \
Scrollable.java \
SwingConstants.java \
SwingUtilities.java \
diff --git a/javax/swing/plaf/Makefile.am b/javax/swing/plaf/Makefile.am
index 211b2a2bd..fbec8d7b2 100644
--- a/javax/swing/plaf/Makefile.am
+++ b/javax/swing/plaf/Makefile.am
@@ -5,7 +5,9 @@ BorderUIResource.java \
ButtonUI.java \
ColorUIResource.java \
ComponentUI.java \
+DimensionUIResource.java \
FontUIResource.java \
+IconUIResource.java \
InsetsUIResource.java \
LabelUI.java \
ListUI.java \
diff --git a/javax/swing/table/Makefile.am b/javax/swing/table/Makefile.am
index b4a100ac7..9dfc4dc43 100644
--- a/javax/swing/table/Makefile.am
+++ b/javax/swing/table/Makefile.am
@@ -1,9 +1,10 @@
EXTRA_DIST = \
AbstractTableModel.java \
+DefaultTableCellRenderer.java \
DefaultTableColumnModel.java \
DefaultTableModel.java \
TableCellEditor.java \
TableCellRenderer.java \
TableColumn.java \
TableColumnModel.java \
-TableModel.java
+TableModel.java
diff --git a/native/Makefile.am b/native/Makefile.am
index eb848a03a..38cd02ea3 100644
--- a/native/Makefile.am
+++ b/native/Makefile.am
@@ -3,7 +3,7 @@
if CREATE_JNI_LIBRARIES
if CREATE_CNI_LIBRARIES
-sUBDIRS = fdlibm cni jni
+SUBDIRS = fdlibm cni jni
else
SUBDIRS = fdlibm jni
endif
diff --git a/native/jni/Makefile.am b/native/jni/Makefile.am
index efc25f0bf..e1bc9d3e2 100644
--- a/native/jni/Makefile.am
+++ b/native/jni/Makefile.am
@@ -1 +1,8 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+if CREATE_GTK_PEER_LIBRARIES
SUBDIRS = classpath java-io java-lang java-net java-util gtk-peer
+else
+SUBDIRS = classpath java-io java-lang java-net java-util
+endif
+