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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102082 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 0 insertions, 225 deletions

diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java
deleted file mode 100644
index 80ad1580362..00000000000
--- a/libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/* GtkFontPeer.java -- Implements FontPeer with GTK+
-   Copyright (C) 1999, 2004, 2005  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 gnu.java.awt.peer.gtk;
-
-import gnu.java.awt.peer.ClasspathFontPeer;
-
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.font.LineMetrics;
-import java.awt.geom.Rectangle2D;
-import java.text.CharacterIterator;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class GtkFontPeer extends ClasspathFontPeer
-{
-  private static ResourceBundle bundle;
-
-  static
-  {
-    try
-      {
-	bundle = ResourceBundle.getBundle ("gnu.java.awt.peer.gtk.font");
-      }
-    catch (Throwable ignored)
-      {
-	bundle = null;
-      }
-  }
-
-  private final String Xname;
-
-  public GtkFontPeer (String name, int style)
-  {
-    // All fonts get a default size of 12 if size is not specified.
-    this(name, style, 12);
-  }
-
-  public GtkFontPeer (String name, int style, int size)
-  {
-    super(name, style, size);
-
-    String Xname = null;
-    if (bundle != null)
-      {
-	try
-	  {
-	    Xname = bundle.getString (name.toLowerCase () + "." + style);
-	  }
-	catch (MissingResourceException mre)
-	  {
-	    // ignored
-	  }
-      }
-
-    if (Xname == null)
-      {
-	String weight;
-	String slant;
-	String spacing;
-
-	if (style == Font.ITALIC || (style == (Font.BOLD+Font.ITALIC)))
-	  slant = "i";
-	else
-	  slant = "r";
-	if (style == Font.BOLD || (style == (Font.BOLD+Font.ITALIC)))
-	  weight = "bold";
-	else
-	  weight = "medium";
-	if (name.equals("Serif") || name.equals("SansSerif")
-	    || name.equals("Helvetica") || name.equals("Times"))
-	  spacing = "p";
-	else
-	  spacing = "c";
-
-        Xname = "-*-*-" + weight + "-" + slant + "-normal-*-*-" + size + "-*-*-" + spacing + "-*-*-*";
-      }
-
-    this.Xname = Xname;
-  }
-
-  public String getXLFD ()
-  {
-    return Xname;
-  }
-
-
-  /* remaining methods are for static compatibility with the newer
-     ClasspathFontPeer superclass; none of these methods ever existed or
-     worked on the older FontPeer interface, but we need to pretend to
-     support them anyways. */
-
-  public boolean canDisplay (Font font, char c)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public int canDisplayUpTo (Font font, CharacterIterator i, int start, int limit)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public String getSubFamilyName (Font font, Locale locale)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public String getPostScriptName (Font font)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public int getNumGlyphs (Font font)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public int getMissingGlyphCode (Font font)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public byte getBaselineFor (Font font, char c)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public String getGlyphName (Font font, int glyphIndex)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public GlyphVector createGlyphVector (Font font,
-                                                 FontRenderContext frc,
-                                                 CharacterIterator ci)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public GlyphVector createGlyphVector (Font font, 
-                                                 FontRenderContext ctx, 
-                                                 int[] glyphCodes)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public GlyphVector layoutGlyphVector (Font font, 
-                                                 FontRenderContext frc, 
-                                                 char[] chars, int start, 
-                                                 int limit, int flags)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public FontMetrics getFontMetrics (Font font)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean hasUniformLineMetrics (Font font)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public LineMetrics getLineMetrics (Font font, 
-                                              CharacterIterator ci, 
-                                              int begin, int limit, 
-                                              FontRenderContext rc)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public Rectangle2D getMaxCharBounds (Font font, 
-                                                FontRenderContext rc)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public Rectangle2D getStringBounds (Font font, 
-                                               CharacterIterator ci, 
-                                               int begin, int limit, 
-                                               FontRenderContext frc)
-  {
-    throw new UnsupportedOperationException();
-  }
-}