2008-02-09 Dalibor Topic <robilad@kaffe.org>

* native/jni/Makefile.am (all-local): Call check_jni_methods.sh
directly.

* scripts/Makefile.am (EXTRA_DIST): Removed check_jni_methods.sh.

* include/Makefile.am (SOUND_H_FILES, GST_PEER_H_FILES)
(XMLJ_H_FILES, GTKPEER_H_FILES, QTPEER_H_FILES)
(GCONF_PREFS_FILES, H_FILES): Don't generate header files
in the source directory, as it may not be writeable.
(DISTCLEANFILES) Added H_FILES.

* configure.ac (AC_CONFIG_FILES): Added
scripts/check_jni_methods.sh.

* scripts/check_jni_methods.sh: Removed. Moved over to ..
* scripts/check_jni_methods.sh.in: New file. Added
top_srcdir and top_builddir where necessary.

6 files changed, 284 insertions, 263 deletions

diff --git a/ChangeLog b/ChangeLog
index 3addb38c4..833e35dd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2008-02-09  Dalibor Topic  <robilad@kaffe.org>
+
+	* native/jni/Makefile.am (all-local): Call check_jni_methods.sh
+	directly.
+
+	* scripts/Makefile.am (EXTRA_DIST): Removed check_jni_methods.sh.
+
+	* include/Makefile.am (SOUND_H_FILES, GST_PEER_H_FILES)
+	(XMLJ_H_FILES, GTKPEER_H_FILES, QTPEER_H_FILES)
+	(GCONF_PREFS_FILES, H_FILES): Don't generate header files
+	in the source directory, as it may not be writeable.
+	(DISTCLEANFILES) Added H_FILES.
+
+	* configure.ac (AC_CONFIG_FILES): Added 
+	scripts/check_jni_methods.sh.
+
+	* scripts/check_jni_methods.sh: Removed. Moved over to ..
+	* scripts/check_jni_methods.sh.in: New file. Added 
+	top_srcdir and top_builddir where necessary.
+	
 2008-02-09  Mario Torre  <neugens@limasoftware.net>
 
 	* include/java_util_VMTimeZone.h: Removed.
diff --git a/configure.ac b/configure.ac
index 07247f32e..73c88ad58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -976,6 +976,7 @@ scripts/classpath.spec
 lib/Makefile
 lib/gen-classlist.sh
 lib/copy-vmresources.sh
+scripts/check_jni_methods.sh
 tools/Makefile
 examples/Makefile
 examples/Makefile.jawt
diff --git a/include/Makefile.am b/include/Makefile.am
index eb91a8a6f..d0c3b2598 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,6 @@
 include_HEADERS = jni.h jni_md.h jawt.h jawt_md.h
 
-DISTCLEANFILES = jni_md.h config-int.h
+DISTCLEANFILES = jni_md.h config-int.h $(H_FILES)
 
 ARG_JNI_JAVAH = -jni
 ARG_CLASSPATH_JAVAH = -bootclasspath
@@ -8,118 +8,118 @@ JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) ../lib:$(USER_CLAS
 CLASSDIR = lib
 
 SOUND_H_FILES = \
-$(top_srcdir)/include/gnu_javax_sound_midi_alsa_AlsaPortDevice.h \
-$(top_srcdir)/include/gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice.h \
-$(top_srcdir)/include/gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.h \
-$(top_srcdir)/include/gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.h \
-$(top_srcdir)/include/gnu_javax_sound_midi_dssi_DSSISynthesizer.h
+gnu_javax_sound_midi_alsa_AlsaPortDevice.h \
+gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice.h \
+gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.h \
+gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.h \
+gnu_javax_sound_midi_dssi_DSSISynthesizer.h
 
 GST_PEER_H_FILES = \
-$(top_srcdir)/include/gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer.h \
-$(top_srcdir)/include/gnu_javax_sound_sampled_gstreamer_io_GstInputStream.h \
-$(top_srcdir)/include/gnu_javax_sound_sampled_gstreamer_lines_GstNativeDataLine.h \
-$(top_srcdir)/include/gnu_javax_sound_sampled_gstreamer_lines_GstPipeline.h
+gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer.h \
+gnu_javax_sound_sampled_gstreamer_io_GstInputStream.h \
+gnu_javax_sound_sampled_gstreamer_lines_GstNativeDataLine.h \
+gnu_javax_sound_sampled_gstreamer_lines_GstPipeline.h
 
 XMLJ_H_FILES = \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeDocument.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeXPathNodeList.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeDocumentType.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeProcessingInstruction.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeTypeInfo.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeNodeList.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeNotation.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeXPathResult.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeElement.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeEntity.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeNode.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeXPathExpression.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeNamedNodeMap.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeDocumentBuilder.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeAttr.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_sax_GnomeLocator.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_sax_GnomeXMLReader.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_transform_GnomeTransformer.h \
-$(top_srcdir)/include/gnu_xml_libxmlj_transform_GnomeTransformerFactory.h
+gnu_xml_libxmlj_dom_GnomeDocument.h \
+gnu_xml_libxmlj_dom_GnomeXPathNodeList.h \
+gnu_xml_libxmlj_dom_GnomeDocumentType.h \
+gnu_xml_libxmlj_dom_GnomeProcessingInstruction.h \
+gnu_xml_libxmlj_dom_GnomeTypeInfo.h \
+gnu_xml_libxmlj_dom_GnomeNodeList.h \
+gnu_xml_libxmlj_dom_GnomeNotation.h \
+gnu_xml_libxmlj_dom_GnomeXPathResult.h \
+gnu_xml_libxmlj_dom_GnomeElement.h \
+gnu_xml_libxmlj_dom_GnomeEntity.h \
+gnu_xml_libxmlj_dom_GnomeNode.h \
+gnu_xml_libxmlj_dom_GnomeXPathExpression.h \
+gnu_xml_libxmlj_dom_GnomeNamedNodeMap.h \
+gnu_xml_libxmlj_dom_GnomeDocumentBuilder.h \
+gnu_xml_libxmlj_dom_GnomeAttr.h \
+gnu_xml_libxmlj_sax_GnomeLocator.h \
+gnu_xml_libxmlj_sax_GnomeXMLReader.h \
+gnu_xml_libxmlj_transform_GnomeTransformer.h \
+gnu_xml_libxmlj_transform_GnomeTransformerFactory.h
 
 GTKPEER_H_FILES = \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_CairoSurface.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_ComponentGraphics.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkFontPeer.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkRobotPeer.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.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_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_GtkEmbeddedWindowPeer.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_GtkImage.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_GtkMenuBarPeer.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.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_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_GtkVolatileImage.h \
-$(top_srcdir)/include/gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer.h
+gnu_java_awt_peer_gtk_CairoSurface.h \
+gnu_java_awt_peer_gtk_CairoGraphics2D.h \
+gnu_java_awt_peer_gtk_ComponentGraphics.h \
+gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h \
+gnu_java_awt_peer_gtk_FreetypeGlyphVector.h \
+gnu_java_awt_peer_gtk_GdkFontPeer.h \
+gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h \
+gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
+gnu_java_awt_peer_gtk_GdkRobotPeer.h \
+gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h \
+gnu_java_awt_peer_gtk_GtkButtonPeer.h \
+gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
+gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h \
+gnu_java_awt_peer_gtk_GtkCheckboxPeer.h \
+gnu_java_awt_peer_gtk_GtkChoicePeer.h \
+gnu_java_awt_peer_gtk_GtkClipboard.h \
+gnu_java_awt_peer_gtk_GtkComponentPeer.h \
+gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h \
+gnu_java_awt_peer_gtk_GtkFileDialogPeer.h \
+gnu_java_awt_peer_gtk_GtkFramePeer.h \
+gnu_java_awt_peer_gtk_GtkGenericPeer.h \
+gnu_java_awt_peer_gtk_GtkImage.h \
+gnu_java_awt_peer_gtk_GtkLabelPeer.h \
+gnu_java_awt_peer_gtk_GtkListPeer.h \
+gnu_java_awt_peer_gtk_GtkMenuBarPeer.h \
+gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h \
+gnu_java_awt_peer_gtk_GtkMenuItemPeer.h \
+gnu_java_awt_peer_gtk_GtkMenuPeer.h \
+gnu_java_awt_peer_gtk_GtkPanelPeer.h \
+gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h \
+gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
+gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
+gnu_java_awt_peer_gtk_GtkSelection.h \
+gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
+gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
+gnu_java_awt_peer_gtk_GtkToolkit.h \
+gnu_java_awt_peer_gtk_GtkWindowPeer.h \
+gnu_java_awt_peer_gtk_GtkVolatileImage.h \
+gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer.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_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_QtEmbeddedWindowPeer.h 
+gnu_java_awt_peer_qt_QtCheckboxPeer.h \
+gnu_java_awt_peer_qt_QtToolkit.h \
+gnu_java_awt_peer_qt_QtAudioClip.h \
+gnu_java_awt_peer_qt_QtScreenDevice.h \
+gnu_java_awt_peer_qt_QtTextFieldPeer.h \
+gnu_java_awt_peer_qt_QtMenuItemPeer.h \
+gnu_java_awt_peer_qt_QtButtonPeer.h \
+gnu_java_awt_peer_qt_QtWindowPeer.h \
+gnu_java_awt_peer_qt_QtDialogPeer.h \
+gnu_java_awt_peer_qt_QtImage.h \
+gnu_java_awt_peer_qt_QtMenuBarPeer.h \
+gnu_java_awt_peer_qt_QtVolatileImage.h \
+gnu_java_awt_peer_qt_QtFontPeer.h \
+gnu_java_awt_peer_qt_QtChoicePeer.h \
+gnu_java_awt_peer_qt_QtGraphics.h \
+gnu_java_awt_peer_qt_QtComponentPeer.h \
+gnu_java_awt_peer_qt_QtMenuPeer.h \
+gnu_java_awt_peer_qt_QtTextAreaPeer.h \
+gnu_java_awt_peer_qt_QPen.h \
+gnu_java_awt_peer_qt_QtPanelPeer.h \
+gnu_java_awt_peer_qt_QPainterPath.h \
+gnu_java_awt_peer_qt_QtFontMetrics.h \
+gnu_java_awt_peer_qt_QtScrollPanePeer.h \
+gnu_java_awt_peer_qt_QMatrix.h \
+gnu_java_awt_peer_qt_QtLabelPeer.h \
+gnu_java_awt_peer_qt_QtPopupMenuPeer.h \
+gnu_java_awt_peer_qt_QtFramePeer.h \
+gnu_java_awt_peer_qt_QtListPeer.h \
+gnu_java_awt_peer_qt_QtScrollbarPeer.h \
+gnu_java_awt_peer_qt_QtCanvasPeer.h \
+gnu_java_awt_peer_qt_QtMenuComponentPeer.h \
+gnu_java_awt_peer_qt_MainQtThread.h \
+gnu_java_awt_peer_qt_QtFileDialogPeer.h \
+gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h 
 
 GCONF_PREFS_FILES = \
-$(top_srcdir)/include/gnu_java_util_prefs_gconf_GConfNativePeer.h
+gnu_java_util_prefs_gconf_GConfNativePeer.h
 
 H_FILES = \
 $(SOUND_H_FILES) \
@@ -128,297 +128,297 @@ $(XMLJ_H_FILES) \
 $(GTKPEER_H_FILES) \
 $(QTPEER_H_FILES) \
 $(GCONF_PREFS_FILES) \
-$(top_srcdir)/include/gnu_java_net_VMPlainSocketImpl.h \
-$(top_srcdir)/include/gnu_java_net_local_LocalSocketImpl.h \
-$(top_srcdir)/include/gnu_java_nio_EpollSelectorImpl.h \
-$(top_srcdir)/include/gnu_java_nio_FileChannelImpl.h \
-$(top_srcdir)/include/gnu_java_nio_KqueueSelectorImpl.h \
-$(top_srcdir)/include/gnu_java_nio_VMChannel.h \
-$(top_srcdir)/include/gnu_java_nio_VMPipe.h \
-$(top_srcdir)/include/gnu_java_nio_VMSelector.h \
-$(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvEncoder.h \
-$(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvDecoder.h \
-$(top_srcdir)/include/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h \
-$(top_srcdir)/include/java_io_VMFile.h \
-$(top_srcdir)/include/java_io_VMObjectInputStream.h \
-$(top_srcdir)/include/java_io_VMObjectStreamClass.h \
-$(top_srcdir)/include/java_lang_VMDouble.h \
-$(top_srcdir)/include/java_lang_VMFloat.h \
-$(top_srcdir)/include/java_lang_VMMath.h \
-$(top_srcdir)/include/java_lang_VMProcess.h \
-$(top_srcdir)/include/java_lang_VMSystem.h \
-$(top_srcdir)/include/java_lang_reflect_VMArray.h \
-$(top_srcdir)/include/java_net_VMInetAddress.h \
-$(top_srcdir)/include/java_net_VMNetworkInterface.h \
-$(top_srcdir)/include/java_net_VMURLConnection.h \
-$(top_srcdir)/include/java_nio_VMDirectByteBuffer.h \
-$(top_srcdir)/include/java_nio_MappedByteBufferImpl.h \
-$(top_srcdir)/include/java_util_VMTimeZone.h
+gnu_java_net_VMPlainSocketImpl.h \
+gnu_java_net_local_LocalSocketImpl.h \
+gnu_java_nio_EpollSelectorImpl.h \
+gnu_java_nio_FileChannelImpl.h \
+gnu_java_nio_KqueueSelectorImpl.h \
+gnu_java_nio_VMChannel.h \
+gnu_java_nio_VMPipe.h \
+gnu_java_nio_VMSelector.h \
+gnu_java_nio_charset_iconv_IconvEncoder.h \
+gnu_java_nio_charset_iconv_IconvDecoder.h \
+gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h \
+java_io_VMFile.h \
+java_io_VMObjectInputStream.h \
+java_io_VMObjectStreamClass.h \
+java_lang_VMDouble.h \
+java_lang_VMFloat.h \
+java_lang_VMMath.h \
+java_lang_VMProcess.h \
+java_lang_VMSystem.h \
+java_lang_reflect_VMArray.h \
+java_net_VMInetAddress.h \
+java_net_VMNetworkInterface.h \
+java_net_VMURLConnection.h \
+java_nio_VMDirectByteBuffer.h \
+java_nio_MappedByteBufferImpl.h \
+java_util_VMTimeZone.h
 
 if CREATE_JNI_HEADERS
 
 all-local: $(H_FILES)
 
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeDocument.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeDocument.java
+gnu_xml_libxmlj_dom_GnomeDocument.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeDocument.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeDocument
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeXPathNodeList.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java
+gnu_xml_libxmlj_dom_GnomeXPathNodeList.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeXPathNodeList
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeDocumentType.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeDocumentType.java
+gnu_xml_libxmlj_dom_GnomeDocumentType.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeDocumentType.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeDocumentType
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeProcessingInstruction.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java
+gnu_xml_libxmlj_dom_GnomeProcessingInstruction.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeProcessingInstruction
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeTypeInfo.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeTypeInfo.java
+gnu_xml_libxmlj_dom_GnomeTypeInfo.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeTypeInfo.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeTypeInfo
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeNodeList.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeNodeList.java
+gnu_xml_libxmlj_dom_GnomeNodeList.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeNodeList.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeNodeList
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeNotation.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeNotation.java
+gnu_xml_libxmlj_dom_GnomeNotation.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeNotation.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeNotation
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeXPathResult.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeXPathResult.java
+gnu_xml_libxmlj_dom_GnomeXPathResult.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeXPathResult.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeXPathResult
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeElement.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeElement.java
+gnu_xml_libxmlj_dom_GnomeElement.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeElement.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeElement
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeEntity.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeEntity.java
+gnu_xml_libxmlj_dom_GnomeEntity.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeEntity.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeEntity
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeNode.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeNode.java
+gnu_xml_libxmlj_dom_GnomeNode.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeNode.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeNode
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeXPathExpression.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeXPathExpression.java
+gnu_xml_libxmlj_dom_GnomeXPathExpression.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeXPathExpression.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeXPathExpression
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeNamedNodeMap.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java
+gnu_xml_libxmlj_dom_GnomeNamedNodeMap.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeNamedNodeMap
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeDocumentBuilder.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java
+gnu_xml_libxmlj_dom_GnomeDocumentBuilder.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeDocumentBuilder
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_GnomeAttr.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeAttr.java
+gnu_xml_libxmlj_dom_GnomeAttr.h: $(top_srcdir)/gnu/xml/libxmlj/dom/GnomeAttr.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.GnomeAttr
-$(top_srcdir)/include/gnu_xml_libxmlj_sax_GnomeLocator.h: $(top_srcdir)/gnu/xml/libxmlj/sax/GnomeLocator.java
+gnu_xml_libxmlj_sax_GnomeLocator.h: $(top_srcdir)/gnu/xml/libxmlj/sax/GnomeLocator.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.sax.GnomeLocator
-$(top_srcdir)/include/gnu_xml_libxmlj_sax_GnomeXMLReader.h: $(top_srcdir)/gnu/xml/libxmlj/sax/GnomeXMLReader.java
+gnu_xml_libxmlj_sax_GnomeXMLReader.h: $(top_srcdir)/gnu/xml/libxmlj/sax/GnomeXMLReader.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.sax.GnomeXMLReader
-$(top_srcdir)/include/gnu_xml_libxmlj_transform_GnomeTransformer.h: $(top_srcdir)/gnu/xml/libxmlj/transform/GnomeTransformer.java
+gnu_xml_libxmlj_transform_GnomeTransformer.h: $(top_srcdir)/gnu/xml/libxmlj/transform/GnomeTransformer.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.transform.GnomeTransformer
-$(top_srcdir)/include/gnu_xml_libxmlj_transform_GnomeTransformerFactory.h: $(top_srcdir)/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java
+gnu_xml_libxmlj_transform_GnomeTransformerFactory.h: $(top_srcdir)/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java
 	$(JAVAH) -o $@ gnu.xml.libxmlj.transform.GnomeTransformerFactory
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_CairoSurface.h: $(top_srcdir)/gnu/java/awt/peer/gtk/CairoSurface.java
+gnu_java_awt_peer_gtk_CairoSurface.h: $(top_srcdir)/gnu/java/awt/peer/gtk/CairoSurface.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.CairoSurface
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: $(top_srcdir)/gnu/java/awt/peer/gtk/CairoGraphics2D.java
+gnu_java_awt_peer_gtk_CairoGraphics2D.h: $(top_srcdir)/gnu/java/awt/peer/gtk/CairoGraphics2D.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.CairoGraphics2D
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_ComponentGraphics.h: $(top_srcdir)/gnu/java/awt/peer/gtk/ComponentGraphics.java
+gnu_java_awt_peer_gtk_ComponentGraphics.h: $(top_srcdir)/gnu/java/awt/peer/gtk/ComponentGraphics.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.ComponentGraphics
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h: $(top_srcdir)/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java
+gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h: $(top_srcdir)/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.ComponentGraphicsCopy
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h: $(top_srcdir)/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+gnu_java_awt_peer_gtk_FreetypeGlyphVector.h: $(top_srcdir)/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.FreetypeGlyphVector
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkFontPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkFontPeer.java
+gnu_java_awt_peer_gtk_GdkFontPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkFontPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkFontPeer
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
+gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkGraphicsEnvironment
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
+gnu_java_awt_peer_gtk_GdkPixbufDecoder.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkPixbufDecoder
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkRobotPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkRobotPeer.java
+gnu_java_awt_peer_gtk_GdkRobotPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkRobotPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkRobotPeer
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
+gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkScreenGraphicsDevice
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkButtonPeer.java
+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
+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_GtkCheckboxMenuItemPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java
+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
+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
+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
+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
+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_GtkEmbeddedWindowPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java
+gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkEmbeddedWindowPeer
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
+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
+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
+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_GtkImage.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkImage.java
+gnu_java_awt_peer_gtk_GtkImage.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkImage.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkImage
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkLabelPeer.java
+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
+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_GtkMenuBarPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java
+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_GtkMenuComponentPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
+gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkMenuComponentPeer
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
+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
+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
+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
+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
+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
+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_GtkSelection.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkSelection.java
+gnu_java_awt_peer_gtk_GtkSelection.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkSelection.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkSelection
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
+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_GtkTextFieldPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
+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
+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
+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/gnu_java_awt_peer_gtk_GtkVolatileImage.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkVolatileImage.java
+gnu_java_awt_peer_gtk_GtkVolatileImage.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkVolatileImage.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkVolatileImage
-$(top_srcdir)/include/gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer.h: $(top_srcdir)/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java
+gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer.h: $(top_srcdir)/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.dnd.peer.gtk.GtkDragSourceContextPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtCheckboxPeer.java
+gnu_java_awt_peer_qt_QtCheckboxPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtCheckboxPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtCheckboxPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtToolkit.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtToolkit.java
+gnu_java_awt_peer_qt_QtToolkit.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtToolkit.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtToolkit
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtAudioClip.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtAudioClip.java
+gnu_java_awt_peer_qt_QtAudioClip.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtAudioClip.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtAudioClip
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtScreenDevice.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtScreenDevice.java
+gnu_java_awt_peer_qt_QtScreenDevice.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtScreenDevice.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtScreenDevice
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtTextFieldPeer.java
+gnu_java_awt_peer_qt_QtTextFieldPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtTextFieldPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtTextFieldPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtMenuItemPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtMenuItemPeer.java
+gnu_java_awt_peer_qt_QtMenuItemPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtMenuItemPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtMenuItemPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtButtonPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtButtonPeer.java
+gnu_java_awt_peer_qt_QtButtonPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtButtonPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtButtonPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtWindowPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtWindowPeer.java
+gnu_java_awt_peer_qt_QtWindowPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtWindowPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtWindowPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtDialogPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtDialogPeer.java
+gnu_java_awt_peer_qt_QtDialogPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtDialogPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtDialogPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtImage.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtImage.java
+gnu_java_awt_peer_qt_QtImage.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtImage.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtImage
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtMenuBarPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtMenuBarPeer.java
+gnu_java_awt_peer_qt_QtMenuBarPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtMenuBarPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtMenuBarPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtVolatileImage.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtVolatileImage.java
+gnu_java_awt_peer_qt_QtVolatileImage.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtVolatileImage.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtVolatileImage
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtFontPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtFontPeer.java
+gnu_java_awt_peer_qt_QtFontPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtFontPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtFontPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtChoicePeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtChoicePeer.java
+gnu_java_awt_peer_qt_QtChoicePeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtChoicePeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtChoicePeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtGraphics.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtGraphics.java
+gnu_java_awt_peer_qt_QtGraphics.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtGraphics.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtGraphics
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtComponentPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtComponentPeer.java
+gnu_java_awt_peer_qt_QtComponentPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtComponentPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtComponentPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtMenuPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtMenuPeer.java
+gnu_java_awt_peer_qt_QtMenuPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtMenuPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtMenuPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtTextAreaPeer.java
+gnu_java_awt_peer_qt_QtTextAreaPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtTextAreaPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtTextAreaPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QPen.h: $(top_srcdir)/gnu/java/awt/peer/qt/QPen.java
+gnu_java_awt_peer_qt_QPen.h: $(top_srcdir)/gnu/java/awt/peer/qt/QPen.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QPen
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtPanelPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtPanelPeer.java
+gnu_java_awt_peer_qt_QtPanelPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtPanelPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtPanelPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QPainterPath.h: $(top_srcdir)/gnu/java/awt/peer/qt/QPainterPath.java
+gnu_java_awt_peer_qt_QPainterPath.h: $(top_srcdir)/gnu/java/awt/peer/qt/QPainterPath.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QPainterPath
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtFontMetrics.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtFontMetrics.java
+gnu_java_awt_peer_qt_QtFontMetrics.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtFontMetrics.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtFontMetrics
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtScrollPanePeer.java
+gnu_java_awt_peer_qt_QtScrollPanePeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtScrollPanePeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtScrollPanePeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QMatrix.h: $(top_srcdir)/gnu/java/awt/peer/qt/QMatrix.java
+gnu_java_awt_peer_qt_QMatrix.h: $(top_srcdir)/gnu/java/awt/peer/qt/QMatrix.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QMatrix
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtLabelPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtLabelPeer.java
+gnu_java_awt_peer_qt_QtLabelPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtLabelPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtLabelPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtPopupMenuPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtPopupMenuPeer.java
+gnu_java_awt_peer_qt_QtPopupMenuPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtPopupMenuPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtPopupMenuPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtFramePeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtFramePeer.java
+gnu_java_awt_peer_qt_QtFramePeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtFramePeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtFramePeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtListPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtListPeer.java
+gnu_java_awt_peer_qt_QtListPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtListPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtListPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtScrollbarPeer.java
+gnu_java_awt_peer_qt_QtScrollbarPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtScrollbarPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtScrollbarPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtCanvasPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtCanvasPeer.java
+gnu_java_awt_peer_qt_QtCanvasPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtCanvasPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtCanvasPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtMenuComponentPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtMenuComponentPeer.java
+gnu_java_awt_peer_qt_QtMenuComponentPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtMenuComponentPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtMenuComponentPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_MainQtThread.h: $(top_srcdir)/gnu/java/awt/peer/qt/MainQtThread.java
+gnu_java_awt_peer_qt_MainQtThread.h: $(top_srcdir)/gnu/java/awt/peer/qt/MainQtThread.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.MainQtThread
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtFileDialogPeer.java
+gnu_java_awt_peer_qt_QtFileDialogPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtFileDialogPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtFileDialogPeer
-$(top_srcdir)/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java
+gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h: $(top_srcdir)/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.QtEmbeddedWindowPeer
-$(top_srcdir)/include/gnu_javax_sound_midi_alsa_AlsaPortDevice.h: $(top_srcdir)/gnu/javax/sound/midi/alsa/AlsaPortDevice.java
+gnu_javax_sound_midi_alsa_AlsaPortDevice.h: $(top_srcdir)/gnu/javax/sound/midi/alsa/AlsaPortDevice.java
 	$(JAVAH) -o $@ gnu.javax.sound.midi.alsa.AlsaPortDevice
-$(top_srcdir)/include/gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice.h: $(top_srcdir)/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java
+gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice.h: $(top_srcdir)/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java
 	$(JAVAH) -o $@ gnu.javax.sound.midi.alsa.AlsaMidiSequencerDevice
-$(top_srcdir)/include/gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.h: $(top_srcdir)/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java
+gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.h: $(top_srcdir)/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java
 	$(JAVAH) -o $@ gnu.javax.sound.midi.alsa.AlsaMidiDeviceProvider
-$(top_srcdir)/include/gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.h: $(top_srcdir)/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
+gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.h: $(top_srcdir)/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
 	$(JAVAH) -o $@ gnu.javax.sound.midi.dssi.DSSIMidiDeviceProvider
-$(top_srcdir)/include/gnu_javax_sound_midi_dssi_DSSISynthesizer.h: $(top_srcdir)/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
+gnu_javax_sound_midi_dssi_DSSISynthesizer.h: $(top_srcdir)/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
 	$(JAVAH) -o $@ gnu.javax.sound.midi.dssi.DSSISynthesizer
-$(top_srcdir)/include/gnu_java_util_prefs_gconf_GConfNativePeer.h: $(top_srcdir)/gnu/java/util/prefs/gconf/GConfNativePeer.java
+gnu_java_util_prefs_gconf_GConfNativePeer.h: $(top_srcdir)/gnu/java/util/prefs/gconf/GConfNativePeer.java
 	$(JAVAH) -o $@ gnu.java.util.prefs.gconf.GConfNativePeer
-$(top_srcdir)/include/gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer.h: $(top_builddir)/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java
+gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer.h: $(top_builddir)/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java
 	$(JAVAH) -o $@ gnu.javax.sound.sampled.gstreamer.io.GstAudioFileReaderNativePeer
-$(top_srcdir)/include/gnu_javax_sound_sampled_gstreamer_io_GstInputStream.h: $(top_builddir)/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java
+gnu_javax_sound_sampled_gstreamer_io_GstInputStream.h: $(top_builddir)/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java
 	$(JAVAH) -o $@ gnu.javax.sound.sampled.gstreamer.io.GstInputStream
-$(top_srcdir)/include/gnu_javax_sound_sampled_gstreamer_lines_GstNativeDataLine.h: $(top_builddir)/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java
+gnu_javax_sound_sampled_gstreamer_lines_GstNativeDataLine.h: $(top_builddir)/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java
 	$(JAVAH) -o $@ gnu.javax.sound.sampled.gstreamer.lines.GstNativeDataLine
-$(top_srcdir)/include/gnu_javax_sound_sampled_gstreamer_lines_GstPipeline.h: $(top_builddir)/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java
+gnu_javax_sound_sampled_gstreamer_lines_GstPipeline.h: $(top_builddir)/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java
 	$(JAVAH) -o $@ gnu.javax.sound.sampled.gstreamer.lines.GstPipeline
-$(top_srcdir)/include/gnu_java_net_VMPlainSocketImpl.h: $(top_srcdir)/vm/reference/gnu/java/net/VMPlainSocketImpl.java
+gnu_java_net_VMPlainSocketImpl.h: $(top_srcdir)/vm/reference/gnu/java/net/VMPlainSocketImpl.java
 	$(JAVAH) -o $@ gnu.java.net.VMPlainSocketImpl
-$(top_srcdir)/include/gnu_java_net_local_LocalSocketImpl.h: $(top_srcdir)/gnu/java/net/local/LocalSocketImpl.java
+gnu_java_net_local_LocalSocketImpl.h: $(top_srcdir)/gnu/java/net/local/LocalSocketImpl.java
 	$(JAVAH) -o $@ gnu.java.net.local.LocalSocketImpl
-$(top_srcdir)/include/gnu_java_nio_VMChannel.h: $(top_srcdir)/vm/reference/gnu/java/nio/VMChannel.java
+gnu_java_nio_VMChannel.h: $(top_srcdir)/vm/reference/gnu/java/nio/VMChannel.java
 	$(JAVAH) -o $@ gnu.java.nio.VMChannel
-$(top_srcdir)/include/gnu_java_nio_VMPipe.h: $(top_srcdir)/vm/reference/gnu/java/nio/VMPipe.java
+gnu_java_nio_VMPipe.h: $(top_srcdir)/vm/reference/gnu/java/nio/VMPipe.java
 	$(JAVAH) -o $@ gnu.java.nio.VMPipe
-$(top_srcdir)/include/gnu_java_nio_VMSelector.h: $(top_srcdir)/vm/reference/gnu/java/nio/VMSelector.java
+gnu_java_nio_VMSelector.h: $(top_srcdir)/vm/reference/gnu/java/nio/VMSelector.java
 	$(JAVAH) -o $@ gnu.java.nio.VMSelector
-$(top_srcdir)/include/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h: $(top_srcdir)/vm/reference/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
+gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h: $(top_srcdir)/vm/reference/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
 	$(JAVAH) -o $@ gnu.java.lang.management.VMOperatingSystemMXBeanImpl
-$(top_srcdir)/include/java_io_VMFile.h: $(top_srcdir)/vm/reference/java/io/VMFile.java
+java_io_VMFile.h: $(top_srcdir)/vm/reference/java/io/VMFile.java
 	$(JAVAH) -o $@ java.io.VMFile
-$(top_srcdir)/include/java_io_VMObjectInputStream.h: $(top_srcdir)/vm/reference/java/io/VMObjectInputStream.java
+java_io_VMObjectInputStream.h: $(top_srcdir)/vm/reference/java/io/VMObjectInputStream.java
 	$(JAVAH) -o $@ java.io.VMObjectInputStream
-$(top_srcdir)/include/java_io_VMObjectStreamClass.h: $(top_srcdir)/vm/reference/java/io/VMObjectStreamClass.java
+java_io_VMObjectStreamClass.h: $(top_srcdir)/vm/reference/java/io/VMObjectStreamClass.java
 	$(JAVAH) -o $@ java.io.VMObjectStreamClass
-$(top_srcdir)/include/java_lang_VMMath.h: $(top_srcdir)/vm/reference/java/lang/VMMath.java
+java_lang_VMMath.h: $(top_srcdir)/vm/reference/java/lang/VMMath.java
 	$(JAVAH) -o $@ java.lang.VMMath
-$(top_srcdir)/include/java_lang_VMDouble.h: $(top_srcdir)/vm/reference/java/lang/VMDouble.java
+java_lang_VMDouble.h: $(top_srcdir)/vm/reference/java/lang/VMDouble.java
 	$(JAVAH) -o $@ java.lang.VMDouble
-$(top_srcdir)/include/java_lang_VMFloat.h: $(top_srcdir)/vm/reference/java/lang/VMFloat.java
+java_lang_VMFloat.h: $(top_srcdir)/vm/reference/java/lang/VMFloat.java
 	$(JAVAH) -o $@ java.lang.VMFloat
-$(top_srcdir)/include/java_lang_VMProcess.h: $(top_srcdir)/vm/reference/java/lang/VMProcess.java
+java_lang_VMProcess.h: $(top_srcdir)/vm/reference/java/lang/VMProcess.java
 	$(JAVAH) -o $@ java.lang.VMProcess
-$(top_srcdir)/include/java_lang_VMSystem.h: $(top_srcdir)/vm/reference/java/lang/VMSystem.java
+java_lang_VMSystem.h: $(top_srcdir)/vm/reference/java/lang/VMSystem.java
 	$(JAVAH) -o $@ java.lang.VMSystem
-$(top_srcdir)/include/java_lang_reflect_VMArray.h: $(top_srcdir)/vm/reference/java/lang/reflect/VMArray.java
+java_lang_reflect_VMArray.h: $(top_srcdir)/vm/reference/java/lang/reflect/VMArray.java
 	$(JAVAH) -o $@ java.lang.reflect.VMArray
-$(top_srcdir)/include/java_net_VMInetAddress.h: $(top_srcdir)/vm/reference/java/net/VMInetAddress.java
+java_net_VMInetAddress.h: $(top_srcdir)/vm/reference/java/net/VMInetAddress.java
 	$(JAVAH) -o $@ java.net.VMInetAddress
-$(top_srcdir)/include/java_net_VMNetworkInterface.h: $(top_srcdir)/vm/reference/java/net/VMNetworkInterface.java
+java_net_VMNetworkInterface.h: $(top_srcdir)/vm/reference/java/net/VMNetworkInterface.java
 	$(JAVAH) -o $@ java.net.VMNetworkInterface
-$(top_srcdir)/include/java_net_VMURLConnection.h: $(top_srcdir)/vm/reference/java/net/VMURLConnection.java
+java_net_VMURLConnection.h: $(top_srcdir)/vm/reference/java/net/VMURLConnection.java
 	$(JAVAH) -o $@ java.net.VMURLConnection
 
-$(top_srcdir)/include/java_nio_VMDirectByteBuffer.h: $(top_srcdir)/vm/reference/java/nio/VMDirectByteBuffer.java
+java_nio_VMDirectByteBuffer.h: $(top_srcdir)/vm/reference/java/nio/VMDirectByteBuffer.java
 	$(JAVAH) -o $@ java.nio.VMDirectByteBuffer
-$(top_srcdir)/include/java_nio_MappedByteBufferImpl.h: $(top_srcdir)/java/nio/MappedByteBufferImpl.java
+java_nio_MappedByteBufferImpl.h: $(top_srcdir)/java/nio/MappedByteBufferImpl.java
 	$(JAVAH) -o $@ java.nio.MappedByteBufferImpl
 
-$(top_srcdir)/include/gnu_java_nio_FileChannelImpl.h: $(top_srcdir)/gnu/java/nio/FileChannelImpl.java
+gnu_java_nio_FileChannelImpl.h: $(top_srcdir)/gnu/java/nio/FileChannelImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.FileChannelImpl
 
-$(top_srcdir)/include/gnu_java_nio_KqueueSelectorImpl.h: $(top_srcdir)/gnu/java/nio/KqueueSelectorImpl.java
+gnu_java_nio_KqueueSelectorImpl.h: $(top_srcdir)/gnu/java/nio/KqueueSelectorImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.KqueueSelectorImpl
 
-$(top_srcdir)/include/gnu_java_nio_EpollSelectorImpl.h: $(top_srcdir)/gnu/java/nio/EpollSelectorImpl.java
+gnu_java_nio_EpollSelectorImpl.h: $(top_srcdir)/gnu/java/nio/EpollSelectorImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.EpollSelectorImpl
 
-$(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvDecoder.h: $(top_srcdir)/gnu/java/nio/charset/iconv/IconvDecoder.java
+gnu_java_nio_charset_iconv_IconvDecoder.h: $(top_srcdir)/gnu/java/nio/charset/iconv/IconvDecoder.java
 	$(JAVAH) -o $@ gnu.java.nio.charset.iconv.IconvDecoder
-$(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvEncoder.h: $(top_srcdir)/gnu/java/nio/charset/iconv/IconvEncoder.java
+gnu_java_nio_charset_iconv_IconvEncoder.h: $(top_srcdir)/gnu/java/nio/charset/iconv/IconvEncoder.java
 	$(JAVAH) -o $@ gnu.java.nio.charset.iconv.IconvEncoder
-$(top_srcdir)/include/java_util_VMTimeZone.h: $(top_srcdir)/vm/reference/java/util/VMTimeZone.java
+java_util_VMTimeZone.h: $(top_srcdir)/vm/reference/java/util/VMTimeZone.java
 	$(JAVAH) -o $@ java.util.VMTimeZone
 
 endif # CREATE_JNI_HEADERS
diff --git a/native/jni/Makefile.am b/native/jni/Makefile.am
index b820fe745..f37e73864 100644
--- a/native/jni/Makefile.am
+++ b/native/jni/Makefile.am
@@ -40,4 +40,4 @@ DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util \
                midi-dssi native-lib
 
 all-local:
-	cd $(top_srcdir) && $(SHELL) ./scripts/check_jni_methods.sh
+	$(SHELL) $(top_builddir)/scripts/check_jni_methods.sh
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 433784018..9d80ba067 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,2 +1,2 @@
 
-EXTRA_DIST = check_jni_methods.sh generate-locale-list.sh import-cacerts.sh
+EXTRA_DIST = generate-locale-list.sh import-cacerts.sh
diff --git a/scripts/check_jni_methods.sh b/scripts/check_jni_methods.sh.in
index 90a7735ba..b9bc7e7d8 100755..100644
--- a/scripts/check_jni_methods.sh
+++ b/scripts/check_jni_methods.sh.in
@@ -9,20 +9,20 @@ TMPFILE3=/tmp/check-jni-methods.$$.3
 
 # Find all methods defined in the header files generated
 # from the java source files.
-grep -h '^JNIEXPORT .* Java_' include/*.h | \
+grep -h '^JNIEXPORT .* Java_' @top_builddir@/include/*.h | \
         LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' | \
 	sort > $TMPFILE
 
 # Find all methods in the JNI C source files.
-find native/jni -name \*.c | \
+find @top_srcdir@/native/jni -name \*.c | \
 	xargs grep -h '^Java_' | \
         LC_ALL=C sed -e 's,^\(Java_[a-z_A-Z0-9]*\).*$,\1,' > $TMPFILE2
 # Or in the the C++ files. (Note that cpp doesn't follow gnu conventions atm)
 # So we try to match both GNU style and some other style.
-find native/jni -name \*.cpp | \
+find @top_srcdir@/native/jni -name \*.cpp | \
 	xargs grep -h '^Java_' | \
         LC_ALL=C sed -e 's,^\(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2
-find native/jni -name \*.cpp | \
+find @top_srcdir@/native/jni -name \*.cpp | \
 	xargs egrep -h '^(JNIEXPORT .* JNICALL )?Java_' | \
 	cut -f4 -d\  | \
         LC_ALL=C sed -e 's,^\JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2