* configure.in (AC_OUTPUT): Create new Makefiles.

	* gnu/java/awt/Makefile.am (EXTRA_DIST): New macro.
	* java/awt/color/.cvsignore: New file.
	* java/awt/geom/.cvsignore: New file.
	* java/awt/image/Makefile.am (EXTRA_DIST): Updated.
	* java/awt/event/Makefile.am (EXTRA_DIST): Updated.
	* java/awt/geom/Makefile.am: New file.
	* java/awt/color/Makefile.am: New file.
	* java/awt/Makefile.am (EXTRA_DIST): Updated.
	(SUBDIRS): Added color, geom.

11 files changed, 88 insertions, 109 deletions

diff --git a/ChangeLog b/ChangeLog
index be7bc92b6..9926ae89d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2002-01-15  Tom Tromey  <tromey@redhat.com>
 
+	* configure.in (AC_OUTPUT): Create new Makefiles.
+	* gnu/java/awt/Makefile.am (EXTRA_DIST): New macro.
+	* java/awt/color/.cvsignore: New file.
+	* java/awt/geom/.cvsignore: New file.
+	* java/awt/image/Makefile.am (EXTRA_DIST): Updated.
+	* java/awt/event/Makefile.am (EXTRA_DIST): Updated.
+	* java/awt/geom/Makefile.am: New file.
+	* java/awt/color/Makefile.am: New file.
+	* java/awt/Makefile.am (EXTRA_DIST): Updated.
+	(SUBDIRS): Added color, geom.
+
 	* java/awt/GridLayout.java: Merged with libgcj.
 	* java/awt/CardLayout.java: Merged with libgcj.
 
diff --git a/configure.in b/configure.in
index 9b0cf53a2..57a185492 100644
--- a/configure.in
+++ b/configure.in
@@ -266,8 +266,10 @@ include/jni.h
 java/Makefile
 java/applet/Makefile
 java/awt/Makefile
+java/awt/color/Makefile
 java/awt/datatransfer/Makefile
 java/awt/event/Makefile
+java/awt/geom/Makefile
 java/awt/image/Makefile
 java/awt/peer/Makefile
 java/awt/print/Makefile
diff --git a/gnu/java/awt/Makefile.am b/gnu/java/awt/Makefile.am
index 1e983f7b8..fcb55e983 100644
--- a/gnu/java/awt/Makefile.am
+++ b/gnu/java/awt/Makefile.am
@@ -2,3 +2,8 @@
 
 SUBDIRS = image peer
 
+EXTRA_DIST = \
+BitMaskExtent.java \
+Buffers.java \
+ComponentDataBlitOp.java \
+GLightweightPeer.java
diff --git a/java/awt/EventDispatcher.java b/java/awt/EventDispatcher.java
deleted file mode 100644
index 35bcb99a6..000000000
--- a/java/awt/EventDispatcher.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* EventDispatcher.java -- Event queue dispatch thread
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-As a special exception, if you link this library with other files to
-produce an executable, this library does not by itself cause the
-resulting executable to be covered by the GNU General Public License.
-This exception does not however invalidate any other reasons why the
-executable file might be covered by the GNU General Public License. */
-
-
-package java.awt;
-
-/**
-  * This class processes a particular event queue.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
-class EventDispatcher implements Runnable
-{
-
-/*
- * Instance Variables
- */
-
-// Event queue to process
-private EventQueue queue;
-
-// Variable to stop thread
-private boolean stopped = false;
-
-/*
- * Constructors
- */
-
-public
-EventDispatcher(EventQueue queue)
-{
-  System.err.println("Dispatcher created");
-  this.queue = queue;
-}
-
-/*
- * Instance Variables
- */
-public void
-stop()
-{
-  this.stopped = true;
-}
-
-public void
-run()
-{
-  System.err.println("Starting dispatchher run loop");
-  while(!stopped)
-    {
-      System.err.println("Looping....");
-      try 
-        {
-          AWTEvent event = queue.getNextEvent();
-          ((Component)event.getSource()).dispatchEvent(event);
-        }
-      catch(Exception e) { ; }
-    }
-}
-
-} // class EventDispather 
-
diff --git a/java/awt/Makefile.am b/java/awt/Makefile.am
index e0362898a..77645ab2f 100644
--- a/java/awt/Makefile.am
+++ b/java/awt/Makefile.am
@@ -1,36 +1,41 @@
 ## Input file for automake
 
-SUBDIRS = datatransfer image event peer print
+SUBDIRS = color datatransfer geom image event peer print
 
 EXTRA_DIST = \
 AWTError.java \
 AWTEvent.java \
 AWTEventMulticaster.java \
 AWTException.java \
-Adjustable.java \
+ActiveEvent.java \
+Adjustable.java	\
 BorderLayout.java \
 Button.java \
 Canvas.java \
-CardLayout.java \
+CardLayout.java	\
 Checkbox.java \
 CheckboxGroup.java \
 CheckboxMenuItem.java \
 Choice.java \
 Color.java \
 Component.java \
+ComponentOrientation.java \
 Container.java \
 Cursor.java \
 Dialog.java \
 Dimension.java \
-EventDispatcher.java \
-EventQueue.java \
-FileDialog.java \
-FlowLayout.java \
+Event.java \
+EventDispatchThread.java \
+EventQueue.java	\
+FileDialog.java	\
+FlowLayout.java	\
 Font.java \
 FontMetrics.java \
 Frame.java \
 Graphics.java \
-GridLayout.java \
+Graphics2D.java	\
+GraphicsConfiguration.java \
+GridLayout.java	\
 IllegalComponentStateException.java \
 Image.java \
 ImageMediaEntry.java \
@@ -40,7 +45,7 @@ Label.java \
 LayoutManager.java \
 LayoutManager2.java \
 List.java \
-MediaEntry.java \
+MediaEntry.java	\
 MediaTracker.java \
 Menu.java \
 MenuBar.java \
@@ -48,6 +53,7 @@ MenuComponent.java \
 MenuContainer.java \
 MenuItem.java \
 MenuShortcut.java \
+Paint.java \
 Panel.java \
 Point.java \
 Polygon.java \
@@ -55,7 +61,8 @@ PopupMenu.java \
 PrintGraphics.java \
 PrintJob.java \
 Rectangle.java \
-ScrollPane.java \
+RenderingHints.java \
+ScrollPane.java	\
 ScrollPaneAdjustable.java \
 Scrollbar.java \
 Shape.java \
@@ -64,5 +71,5 @@ TextArea.java \
 TextComponent.java \
 TextField.java \
 Toolkit.java \
-Window.java 
-
+Transparency.java \
+Window.java
diff --git a/java/awt/color/.cvsignore b/java/awt/color/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/java/awt/color/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/java/awt/color/Makefile.am b/java/awt/color/Makefile.am
new file mode 100644
index 000000000..8bc35a4c5
--- /dev/null
+++ b/java/awt/color/Makefile.am
@@ -0,0 +1,6 @@
+## Input file for automake
+
+EXTRA_DIST = \
+ColorSpace.java	\
+ICC_ColorSpace.java \
+ICC_Profile.java
diff --git a/java/awt/event/Makefile.am b/java/awt/event/Makefile.am
index db75bfbfe..a092a24f2 100644
--- a/java/awt/event/Makefile.am
+++ b/java/awt/event/Makefile.am
@@ -3,7 +3,7 @@ AWTEventListener.java \
 ActionEvent.java \
 ActionListener.java \
 AdjustmentEvent.java \
-AdjustmentListener.java \
+AdjustmentListener.java	\
 ComponentAdapter.java \
 ComponentEvent.java \
 ComponentListener.java \
@@ -11,26 +11,29 @@ ContainerAdapter.java \
 ContainerEvent.java \
 ContainerListener.java \
 FocusAdapter.java \
-FocusEvent.java \
+FocusEvent.java	\
 FocusListener.java \
-InputEvent.java \
+HierarchyBoundsAdapter.java \
+HierarchyBoundsListener.java \
+HierarchyEvent.java \
+HierarchyListener.java \
+InputEvent.java	\
 InputMethodEvent.java \
 InputMethodListener.java \
 InvocationEvent.java \
 ItemEvent.java \
 ItemListener.java \
-KeyAdapter.java \
+KeyAdapter.java	\
 KeyEvent.java \
 KeyListener.java \
 MouseAdapter.java \
-MouseEvent.java \
+MouseEvent.java	\
 MouseListener.java \
-MouseMotionAdapter.java \
+MouseMotionAdapter.java	\
 MouseMotionListener.java \
-PaintEvent.java \
+PaintEvent.java	\
 TextEvent.java \
 TextListener.java \
 WindowAdapter.java \
 WindowEvent.java \
-WindowListener.java 
-
+WindowListener.java
diff --git a/java/awt/geom/.cvsignore b/java/awt/geom/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/java/awt/geom/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/java/awt/geom/Makefile.am b/java/awt/geom/Makefile.am
new file mode 100644
index 000000000..f8c9a8c45
--- /dev/null
+++ b/java/awt/geom/Makefile.am
@@ -0,0 +1,14 @@
+## Input file for automake
+
+EXTRA_DIST = \
+AffineTransform.java \
+Dimension2D.java \
+Ellipse2D.java \
+IllegalPathStateException.java \
+Line2D.java \
+NoninvertibleTransformException.java \
+PathIterator.java \
+Point2D.java \
+Rectangle2D.java \
+RectangularShape.java \
+RoundRectangle2D.java
diff --git a/java/awt/image/Makefile.am b/java/awt/image/Makefile.am
index 9cf98fa3b..1c5169716 100644
--- a/java/awt/image/Makefile.am
+++ b/java/awt/image/Makefile.am
@@ -1,7 +1,14 @@
 EXTRA_DIST = \
 AreaAveragingScaleFilter.java \
-ColorModel.java \
+BufferedImage.java \
+ColorModel.java	\
+ComponentColorModel.java \
+ComponentSampleModel.java \
 CropImageFilter.java \
+DataBuffer.java	\
+DataBufferByte.java \
+DataBufferInt.java \
+DataBufferUShort.java \
 DirectColorModel.java \
 FilteredImageSource.java \
 ImageConsumer.java \
@@ -10,7 +17,12 @@ ImageObserver.java \
 ImageProducer.java \
 IndexColorModel.java \
 MemoryImageSource.java \
+PackedColorModel.java \
 PixelGrabber.java \
 RGBImageFilter.java \
-ReplicateScaleFilter.java
-
+Raster.java \
+RasterOp.java \
+ReplicateScaleFilter.java \
+SampleModel.java \
+SinglePixelPackedSampleModel.java \
+WritableRaster.java