Major merge with Classpath.

	Removed many duplicate files.
	* HACKING: Updated.x
	* classpath: Imported new directory.
	* standard.omit: New file.
	* Makefile.in, aclocal.m4, configure: Rebuilt.
	* sources.am: New file.
	* configure.ac: Run Classpath configure script.  Moved code around
	to support.  Disable xlib AWT peers (temporarily).
	* Makefile.am (SUBDIRS): Added 'classpath'
	(JAVAC): Removed.
	(AM_CPPFLAGS): Added more -I options.
	(BOOTCLASSPATH): Simplified.
	Completely redid how sources are built.
	Include sources.am.
	* include/Makefile.am (tool_include__HEADERS): Removed jni.h.
	* include/jni.h: Removed (in Classpath).
	* scripts/classes.pl: Updated to look at built classes.
	* scripts/makemake.tcl: New file.
	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added
	-I options.
	(gcj_jni_invocation_compile_c_to_binary): Likewise.

From-SVN: r102082

5 files changed, 0 insertions, 467 deletions

diff --git a/libjava/javax/imageio/event/IIOReadProgressListener.java b/libjava/javax/imageio/event/IIOReadProgressListener.java
deleted file mode 100644
index 404336c..0000000
--- a/libjava/javax/imageio/event/IIOReadProgressListener.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* IIOReadProgressListener.java --
-   Copyright (C) 2004  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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package javax.imageio.event;
-
-import java.util.EventListener;
-
-import javax.imageio.ImageReader;
-
-public interface IIOReadProgressListener extends EventListener
-{
-  /**
-   * Reports that the current image read operation has completed.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   */
-  void imageComplete(ImageReader source);
-
-  /**
-   * Reports the approximate percentage of completions of this image read
-   * operation.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param percentageDone the approximate percentage of encoding completed
-   */
-  void imageProgress(ImageReader source, float percentageDone);
-
-  /**
-   * Reports that the current image read operation has started.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param imageIndex the index of the image to read
-   */
-  void imageStarted(ImageReader source, int imageIndex);
-
-  /**
-   * Reports that a read operation has been aborted.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   */
-  void readAborted(ImageReader source);
-
-  /**
-   * Reports that a sequence of read operationshas completed.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   */
-  void sequenceComplete(ImageReader source);
-
-  /**
-   * Reports that a sequence of read operations is beginning.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param minIndex the index of the first image to be read
-   */
-  void sequenceStarted(ImageReader source, int minIndex);
-
-  /**
-   * Reports that a thumbnail read operation has completed.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   */
-  void thumbnailComplete(ImageReader source);
-
-  /**
-   * Reports the approximate percentage of completion of a thumbnail read
-   * operation.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param percentageDone the approximate percentage of encoding completed
-   */
-  void thumbnailProgress(ImageReader source, float percentageDone);
-
-  /**
-   * Reports that a thumbnail read operation is beginning.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param imageIndex the index of the image being read
-   * @param thumbnailIndex the index of the thumbnail being read
-   */
-  void thumbnailStarted(ImageReader source, int imageIndex, int thumbnailIndex);
-}
diff --git a/libjava/javax/imageio/event/IIOReadUpdateListener.java b/libjava/javax/imageio/event/IIOReadUpdateListener.java
deleted file mode 100644
index 77b1a4e..0000000
--- a/libjava/javax/imageio/event/IIOReadUpdateListener.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/* IIOReadUpdateListener.java --
-   Copyright (C) 2004  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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package javax.imageio.event;
-
-import java.awt.image.BufferedImage;
-import java.util.EventListener;
-
-import javax.imageio.ImageReader;
-
-public interface IIOReadUpdateListener extends EventListener
-{
-  /**
-   * Reports that a given region of the image has been updated.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param image the BufferedImage being updated
-   * @param minX the X coordinate of the leftmost updated column of pixels
-   * @param minY the Y coordinate of the uppermost updated row of pixels
-   * @param width the number of updated pixels horizontally
-   * @param height the number of updated pixels vertically
-   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
-   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
-   * @param bands an array of <code>int</code>s indicating which bands are being updated
-   */
-  void imageUpdate(ImageReader source, BufferedImage image, int minX,
-                   int minY, int width, int height, int periodX, int periodY,
-                   int[] bands);
-
-  /**
-   * Reports that the current read operation has completed a progressive pass.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param image the BufferedImage being updated
-   */
-  void passComplete(ImageReader source, BufferedImage image);
-
-  /**
-   * Reports that the current read operation is about to begin a progressive pass.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param image the BufferedImage being updated
-   * @param pass the numer of the pass that is about to begin, starting with 0
-   * @param minPass the index of the first pass that will be decoded
-   * @param maxPass the index of the last pass that will be decoded
-   * @param minX the X coordinate of the leftmost updated column of pixels
-   * @param minY the Y coordinate of the uppermost updated row of pixels
-   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
-   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
-   * @param bands an array of <code>int</code>s indicating which bands are being updated
-   */
-  void passStarted(ImageReader source, BufferedImage image, int pass,
-                   int minPass, int maxPass, int minX, int minY, int periodX,
-                   int periodY, int[] bands);
-
-  /**
-   * Reports that the current thumbnail read operation has completed a progressive pass.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param image the BufferedImage being updated
-   */
-  void thumbnailPassComplete(ImageReader source, BufferedImage image);
-
-  /**
-   * Reports that the current thumbnail read operation is about to begin a progressive pass.
-   * 
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param image the BufferedImage being updated
-   * @param pass the numer of the pass that is about to begin, starting with 0
-   * @param minPass the index of the first pass that will be decoded
-   * @param maxPass the index of the last pass that will be decoded
-   * @param minX the X coordinate of the leftmost updated column of pixels
-   * @param minY the Y coordinate of the uppermost updated row of pixels
-   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
-   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
-   * @param bands an array of <code>int</code>s indicating which bands are being updated
-   */
-  void thumbnailPassStarted(ImageReader source, BufferedImage image, int pass,
-                            int minPass, int maxPass, int minX, int minY,
-                            int periodX, int periodY, int[] bands);
-
-  /**
-   * Reports that a given region of a thumbnail image has been updated.
-   *
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param image the BufferedImage being updated
-   * @param minX the X coordinate of the leftmost updated column of pixels
-   * @param minY the Y coordinate of the uppermost updated row of pixels
-   * @param width the number of updated pixels horizontally
-   * @param height the number of updated pixels vertically
-   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
-   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
-   * @param bands an array of <code>int</code>s indicating which bands are being updated
-   */
-  void thumbnailUpdate(ImageReader source, BufferedImage image, int minX,
-                       int minY, int width, int height, int periodX,
-                       int periodY, int[] bands);
-}
diff --git a/libjava/javax/imageio/event/IIOReadWarningListener.java b/libjava/javax/imageio/event/IIOReadWarningListener.java
deleted file mode 100644
index e897350..0000000
--- a/libjava/javax/imageio/event/IIOReadWarningListener.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* IIOReadProgressListener.java --
-   Copyright (C) 2004  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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package javax.imageio.event;
-
-import java.util.EventListener;
-
-import javax.imageio.ImageReader;
-
-public interface IIOReadWarningListener extends EventListener
-{
-  /**
-   * Reports the occurrence of a non-fatal error in decoding.
-   * Decoding will continue after this method is called.
-   *
-   * @param source the <code>ImageReader</code> object calling this method
-   * @param warning the warning
-   */
-  void warningOccurred(ImageReader source, String warning);
-}
diff --git a/libjava/javax/imageio/event/IIOWriteProgressListener.java b/libjava/javax/imageio/event/IIOWriteProgressListener.java
deleted file mode 100644
index 16b8891..0000000
--- a/libjava/javax/imageio/event/IIOWriteProgressListener.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/* IIOWriteProgressListener.java --
-   Copyright (C) 2004  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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package javax.imageio.event;
-
-import java.util.EventListener;
-
-import javax.imageio.ImageWriter;
-
-public interface IIOWriteProgressListener extends EventListener
-{
-  /**
-   * Reports that an image write operation has completed.
-   * 
-   * @param source the <code>ImageWriter</code> object calling this method
-   */
-  void imageComplete(ImageWriter source);
-
-  /**
-   * Reports the approximate percentage of completion of an image write
-   * operation.
-   * 
-   * @param source the <code>ImageWriter</code> object calling this method
-   * @param percentageDone the approximate percentage of decoding completed
-   */
-  void imageProgress(ImageWriter source, float percentageDone);
-
-  /**
-   * Reports that a thumbnail write operation has started.
-   * 
-   * @param source the <code>ImageWriter</code> object calling this method
-   * @param imageIndex the index of the image being written
-   */
-  void imageStarted(ImageWriter source, int imageIndex);
-
-  /**
-   * Reports that a thumbnail write operation has completed.
-   * 
-   * @param source the <code>ImageWriter</code> object calling this method
-   */
-  void thumbnailComplete(ImageWriter source);
-
-  /**
-   * Reports the approximate percentage of completion of a thumbnail write
-   * operation.
-   * 
-   * @param source the <code>ImageWriter</code> object calling this method
-   * @param percentageDone the approximate percentage of decoding completed
-   */
-  void thumbnailProgress(ImageWriter source, float percentageDone);
-
-  /**
-   * Reports that a thumbnail write operation is beginning.
-   * 
-   * @param source the <code>ImageWriter</code> object calling this method
-   * @param imageIndex the index of the image being written
-   * @param thumnailIndex the index of the thumbnail being written
-   */
-  void thumbnailStarted(ImageWriter source, int imageIndex, int thumnailIndex);
-
-  /**
-   * Reports that an image write operation is aborted.
-   * 
-   * @param source the <code>ImageWriter</code> object calling this method
-   */
-  void writeAborted(ImageWriter source);
-}
diff --git a/libjava/javax/imageio/event/IIOWriteWarningListener.java b/libjava/javax/imageio/event/IIOWriteWarningListener.java
deleted file mode 100644
index 3c4e3bd..0000000
--- a/libjava/javax/imageio/event/IIOWriteWarningListener.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* IIOWriteWarningListener.java --
-   Copyright (C) 2004  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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package javax.imageio.event;
-
-import java.util.EventListener;
-
-import javax.imageio.ImageWriter;
-
-/**
- * @author Michael Koch (konqueror@gmx.de)
- */
-public interface IIOWriteWarningListener extends EventListener
-{
-  /**
-   * Reports the occurrence of a non-fatal error in encoding.
-   * Encoding will continue after this method is called.
-   *
-   * @param source the <code>ImageWriter</code> object calling this method
-   * @param imageIndex the index of the image generating this warning,
-   * starting with 0
-   * @param warning the warning
-   */
-  void warningOccurred(ImageWriter source, int imageIndex, String warning);
-}