diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | include/Makefile.am | 153 |
4 files changed, 173 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2003-07-24 Thomas Fitzsimmons <fitzsim@redhat.com> + + * Makefile.am (SUBDIRS): Add include. + * configure.in: Add --enable-regen-headers flag. + (AC_OUTPUT): Add include/Makefile. + * include/Makefile.am: New file. + 2003-07-24 Jeroen Frijters <jeroen@frijters.net> * java/sql/Timestamp.java diff --git a/Makefile.am b/Makefile.am index 6fbec7d86..dd8a4c530 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Input file for automake to generate the Makefile.in used by configure # lib first, to compile .class files before native code -SUBDIRS = lib doc gnu java javax native resource vm +SUBDIRS = lib doc gnu java javax include native resource vm native: lib diff --git a/configure.in b/configure.in index 28cc6cd72..37aff03b3 100644 --- a/configure.in +++ b/configure.in @@ -70,11 +70,21 @@ AC_ARG_ENABLE(gtk-peer, 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_ARG_ENABLE(regen-headers, +[ --enable-regen-headers automatically regenerate JNI headers [default=no]], +[case "${enableval}" in + yes) REGENERATE_JNI_HEADERS=yes ;; + no) REGENERATE_JNI_HEADERS=no ;; + *) REGENERATE_JNI_HEADERS=no ;; +esac], +[REGENERATE_JNI_HEADERS=no]) + +AM_CONDITIONAL(CREATE_JNI_HEADERS, test "x${REGENERATE_JNI_HEADERS}" = xyes) + AC_PROG_LN_S AC_PROG_INSTALL @@ -328,6 +338,7 @@ gnu/java/util/prefs/Makefile gnu/javax/Makefile gnu/javax/rmi/Makefile gnu/javax/rmi/CORBA/Makefile +include/Makefile include/jni.h java/Makefile java/applet/Makefile diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 000000000..57468588f --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,153 @@ +ARG_JNI_JAVAH = -jni +ARG_CLASSPATH_JAVAH = -classpath +JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) ../lib:$(USER_CLASSLIB) + +H_FILES = \ +$(top_srcdir)/include/gnu_java_awt_image_GdkPixbufDecoder.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphics.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkChoicePeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkClipboard.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkFramePeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkImagePainter.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkListPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMainThread.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMenuPeer.h \ +$(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_GtkTextAreaPeer.h \ +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.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/java_io_FileDescriptor.h \ +$(top_srcdir)/include/java_io_File.h \ +$(top_srcdir)/include/java_io_ObjectInputStream.h \ +$(top_srcdir)/include/java_lang_Double.h \ +$(top_srcdir)/include/java_lang_Math.h \ +$(top_srcdir)/include/java_lang_Object.h \ +$(top_srcdir)/include/java_lang_VMFloat.h \ +$(top_srcdir)/include/java_lang_VMSystem.h \ +$(top_srcdir)/include/java_lang_reflect_Array.h \ +$(top_srcdir)/include/java_net_InetAddress.h \ +$(top_srcdir)/include/java_net_NetworkInterface.h \ +$(top_srcdir)/include/java_net_PlainDatagramSocketImpl.h \ +$(top_srcdir)/include/java_net_PlainSocketImpl.h \ +$(top_srcdir)/include/java_nio_DirectByteBufferImpl.h \ +$(top_srcdir)/include/gnu_java_nio_FileChannelImpl.h \ +$(top_srcdir)/include/gnu_java_nio_FileLockImpl.h \ +$(top_srcdir)/include/java_util_TimeZone.h + +if CREATE_JNI_HEADERS + +all-local: $(H_FILES) + +$(top_srcdir)/include/gnu_java_awt_image_GdkPixbufDecoder.h: $(top_srcdir)/gnu/java/awt/image/GdkPixbufDecoder.java + $(JAVAH) -o $@ gnu.java.awt.image.GdkPixbufDecoder +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkFontMetrics.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkFontMetrics +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphics.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkGraphics.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkGraphics +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkButtonPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkButtonPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkCanvasPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkCanvasPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkCheckboxGroupPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkCheckboxMenuItemPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkCheckboxPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkChoicePeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkChoicePeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkChoicePeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkClipboard.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkClipboard.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkClipboard +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkComponentPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkComponentPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkFileDialogPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkFramePeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkFramePeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkFramePeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkGenericPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkGenericPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkImagePainter.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkImagePainter.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkImagePainter +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkLabelPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkLabelPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkListPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkListPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkListPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMainThread.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkMainThread.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkMainThread +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkMenuBarPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkMenuItemPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMenuPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkMenuPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkMenuPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkPanelPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkPanelPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkPanelPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkPopupMenuPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkScrollPanePeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkScrollbarPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkTextAreaPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkTextComponentPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkTextFieldPeer +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkToolkit.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkToolkit.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkToolkit +$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkWindowPeer.java + $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkWindowPeer +$(top_srcdir)/include/java_io_FileDescriptor.h: $(top_srcdir)/java/io/FileDescriptor.java + $(JAVAH) -o $@ java.io.FileDescriptor +$(top_srcdir)/include/java_io_File.h: $(top_srcdir)/java/io/File.java + $(JAVAH) -o $@ java.io.File +$(top_srcdir)/include/java_io_ObjectInputStream.h: $(top_srcdir)/java/io/ObjectInputStream.java + $(JAVAH) -o $@ java.io.ObjectInputStream +$(top_srcdir)/include/java_lang_Double.h: $(top_srcdir)/java/lang/Double.java + $(JAVAH) -o $@ java.lang.Double +$(top_srcdir)/include/java_lang_Math.h: $(top_srcdir)/java/lang/Math.java + $(JAVAH) -o $@ java.lang.Math +$(top_srcdir)/include/java_lang_Object.h: $(top_srcdir)/java/lang/Object.java + $(JAVAH) -o $@ java.lang.Object +$(top_srcdir)/include/java_lang_VMFloat.h: $(top_srcdir)/vm/reference/java/lang/VMFloat.java + $(JAVAH) -o $@ java.lang.VMFloat +$(top_srcdir)/include/java_lang_VMSystem.h: $(top_srcdir)/vm/reference/java/lang/VMSystem.java + $(JAVAH) -o $@ java.lang.VMSystem +$(top_srcdir)/include/java_lang_reflect_Array.h: $(top_srcdir)/java/lang/reflect/Array.java + $(JAVAH) -o $@ java.lang.reflect.Array +$(top_srcdir)/include/java_net_InetAddress.h: $(top_srcdir)/java/net/InetAddress.java + $(JAVAH) -o $@ java.net.InetAddress +$(top_srcdir)/include/java_net_NetworkInterface.h: $(top_srcdir)/java/net/NetworkInterface.java + $(JAVAH) -o $@ java.net.NetworkInterface +$(top_srcdir)/include/java_net_PlainDatagramSocketImpl.h: $(top_srcdir)/java/net/PlainDatagramSocketImpl.java + $(JAVAH) -o $@ java.net.PlainDatagramSocketImpl +$(top_srcdir)/include/java_net_PlainSocketImpl.h: $(top_srcdir)/java/net/PlainSocketImpl.java + $(JAVAH) -o $@ java.net.PlainSocketImpl +$(top_srcdir)/include/java_nio_DirectByteBufferImpl.h: $(top_srcdir)/java/nio/DirectByteBufferImpl.java + $(JAVAH) -o $@ java.nio.DirectByteBufferImpl +$(top_srcdir)/include/gnu_java_nio_FileChannelImpl.h: $(top_srcdir)/java/nio/channels/FileChannelImpl.java + $(JAVAH) -o $@ gnu.java.nio.FileChannelImpl +$(top_srcdir)/include/gnu_java_nio_FileLockImpl.h: $(top_srcdir)/gnu/java/nio/FileLockImpl.java + $(JAVAH) -o $@ gnu.java.nio.FileLockImpl +$(top_srcdir)/include/java_util_TimeZone.h: $(top_srcdir)/java/util/TimeZone.java + $(JAVAH) -o $@ java.util.TimeZone + +endif # CREATE_JNI_HEADERS |