From 947b8814056ea2fba6bbcfab86591f74bffc0311 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 23 Sep 2005 21:31:04 +0000 Subject: Imported Classpath 0.18. * sources.am, Makefile.in: Updated. * Makefile.am (nat_source_files): Removed natProxy.cc. * java/lang/reflect/natProxy.cc: Removed. * gnu/classpath/jdwp/VMFrame.java, gnu/classpath/jdwp/VMIdManager.java, gnu/classpath/jdwp/VMVirtualMachine.java, java/lang/reflect/VMProxy.java: New files. 2005-09-23 Thomas Fitzsimmons * scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC list. 2005-09-23 Thomas Fitzsimmons * gnu/java/net/DefaultContentHandlerFactory.java (getContent): Remove ClasspathToolkit references. 2005-09-23 Thomas Fitzsimmons * gnu/awt/xlib/XCanvasPeer.java: Add new peer methods. * gnu/awt/xlib/XFramePeer.java: Likewise. * gnu/awt/xlib/XGraphicsConfiguration.java: Likewise. 2005-09-23 Thomas Fitzsimmons * Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c. Add classpath/native/jawt/jawt.c. * Makefile.in: Regenerate. * jawt.c: Remove file. * include/Makefile.am (tool_include__HEADERS): Remove jawt.h and jawt_md.h. Add ../classpath/include/jawt.h and ../classpath/include/jawt_md.h. * include/Makefile.in: Regenerate. * include/jawt.h: Regenerate. * include/jawt_md.h: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104586 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/include/Makefile.am | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'libjava/classpath/include/Makefile.am') diff --git a/libjava/classpath/include/Makefile.am b/libjava/classpath/include/Makefile.am index 7b698e63b23..a65ac5e473f 100644 --- a/libjava/classpath/include/Makefile.am +++ b/libjava/classpath/include/Makefile.am @@ -1,3 +1,5 @@ +include_HEADERS = jni.h jni_md.h jawt.h jawt_md.h + DISTCLEANFILES = jni_md.h ARG_JNI_JAVAH = -jni @@ -57,15 +59,55 @@ $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkPanelPeer.h \ $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h \ $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \ $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkSelection.h \ $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \ $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \ $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkToolkit.h \ $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h \ $(top_srcdir)/include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h +QTPEER_H_FILES = \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtToolkit.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtAudioClip.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtScreenDevice.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtMenuItemPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtButtonPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtWindowPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtDialogPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtImage.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtMenuBarPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtVolatileImage.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtFontPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtChoicePeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtGraphics.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtComponentPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtMenuPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QPen.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtPanelPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QPainterPath.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtFontMetrics.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtGraphicsEnvironment.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QMatrix.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtLabelPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtPopupMenuPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtFramePeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtListPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtCanvasPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtMenuComponentPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_MainQtThread.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtContainerPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h + H_FILES = \ $(XMLJ_H_FILES) \ $(GTKPEER_H_FILES) \ +$(QTPEER_H_FILES) \ $(top_srcdir)/include/gnu_java_net_PlainDatagramSocketImpl.h \ $(top_srcdir)/include/gnu_java_net_PlainSocketImpl.h \ $(top_srcdir)/include/gnu_java_nio_VMPipe.h \ @@ -104,6 +146,9 @@ $(top_srcdir)/include/gnu_xml_libxmlj_transform_%.h: $(top_builddir)/lib/gnu/xml $(top_srcdir)/include/gnu_java_awt_peer_gtk_%.h: $(top_builddir)/lib/gnu/java/awt/peer/gtk/%.class $(JAVAH) -o $@ gnu.java.awt.peer.gtk.$* +$(top_srcdir)/include/gnu_java_awt_peer_qt_%.h: $(top_builddir)/lib/gnu/java/awt/peer/qt/%.class + $(JAVAH) -o $@ gnu.java.awt.peer.qt.$* + $(top_srcdir)/include/gnu_java_net_PlainDatagramSocketImpl.h: $(top_srcdir)/gnu/java/net/PlainDatagramSocketImpl.java $(JAVAH) -o $@ gnu.java.net.PlainDatagramSocketImpl $(top_srcdir)/include/gnu_java_net_PlainSocketImpl.h: $(top_srcdir)/gnu/java/net/PlainSocketImpl.java -- cgit v1.2.1