Makefile.in: Rebuilt.

	* include/Makefile.in: Rebuilt.
	* include/Makefile.am (tool_include__HEADERS): Include
	classpath's jni.h.

From-SVN: r102296

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 76f566c4c34de44df9417db29fe0c9dd05ff6526..a59f29431813643e6766493abf2a0d8e11799acc 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-22  Tom Tromey  <tromey@redhat.com>
+
+       * include/Makefile.in: Rebuilt.
+       * include/Makefile.am (tool_include__HEADERS): Include
+       classpath's jni.h.
+
 2005-07-20  Tom Tromey  <tromey@redhat.com>
 
        * sources.am, Makefile.in: Rebuilt.

diff --git a/libjava/include/Makefile.am b/libjava/include/Makefile.am
index 77cd99cea907787eaff15736126dc0bc242fe232..921aa5b5a29380fc56395aefb21d7018829d76f5 100644 (file)
--- a/libjava/include/Makefile.am
+++ b/libjava/include/Makefile.am
@@ -9,4 +9,7 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 target_noncanonical = @target_noncanonical@
 
 tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
-tool_include__HEADERS = jni_md.h jawt.h jawt_md.h jvmpi.h
+## The 'jni.h' here is fairly hacky, but it is simpler than trying to
+## tell Classpath about our peculiar install directory.
+tool_include__HEADERS = jni_md.h jawt.h jawt_md.h jvmpi.h \
+       ../classpath/include/jni.h

diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in
index 8f8dbee30158898baa529e2ce7b756aad02beb58..6ba4c69b72f716993df42dfbaa1b73e32482b2b9 100644 (file)
--- a/libjava/include/Makefile.in
+++ b/libjava/include/Makefile.in
@@ -297,7 +297,9 @@ AUTOMAKE_OPTIONS = foreign
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
-tool_include__HEADERS = jni_md.h jawt.h jawt_md.h jvmpi.h
+tool_include__HEADERS = jni_md.h jawt.h jawt_md.h jvmpi.h \
+       ../classpath/include/jni.h
+
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -425,6 +427,7 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
+       $(mkdir_p) $(distdir)/../classpath/include
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \