diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-22 20:45:36 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-22 20:45:36 +0000 |
| commit | 5fd88250aec9eb508d706805bcd430173d977950 (patch) | |
| tree | b0a828daef22a51efc3cb297c88975690c949897 | |
| parent | b0ff69b145684f61556bb831742bda48a8447d1e (diff) | |
| download | gcc-5fd88250aec9eb508d706805bcd430173d977950.tar.gz | |
* include/Makefile.in: Rebuilt.
* include/Makefile.am (tool_include__HEADERS): Include
classpath's jni.h.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102296 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/include/Makefile.am | 5 | ||||
| -rw-r--r-- | libjava/include/Makefile.in | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 76f566c4c34..a59f2943181 100644 --- 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 77cd99cea90..921aa5b5a29 100644 --- 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 8f8dbee3015..6ba4c69b72f 100644 --- 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 \ |