git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.in: Rebuilt. 

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

From-SVN: r102296
This commit is contained in:
Tom Tromey 2005-07-22 20:45:36 +00:00 committed by Tom Tromey
parent d2fcbf6f86
commit 46a2c9d2d1
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -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> 2005-07-20 Tom Tromey <tromey@redhat.com>
* sources.am, Makefile.in: Rebuilt. * sources.am, Makefile.in: Rebuilt.

5
libjava/include/Makefile.am
View File

@ -9,4 +9,7 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
target_noncanonical = @target_noncanonical@ target_noncanonical = @target_noncanonical@
tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include 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

5
libjava/include/Makefile.in
View File

@ -297,7 +297,9 @@ AUTOMAKE_OPTIONS = foreign
# May be used by various substitution variables. # May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include 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 all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am
@ -425,6 +427,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/../classpath/include
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \