diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2005-03-21 18:12:32 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2005-03-21 18:12:32 +0000 |
| commit | e9bbd9d70730a74f0c43b36961897c23d3dbdce4 (patch) | |
| tree | b529223225cfa13fe07018548450763b2a152593 /libjava/include | |
| parent | 8eb1bc5cf58e5f5c3fa65bae9293afa6c2adf976 (diff) | |
| download | gcc-e9bbd9d70730a74f0c43b36961897c23d3dbdce4.zip gcc-e9bbd9d70730a74f0c43b36961897c23d3dbdce4.tar.gz gcc-e9bbd9d70730a74f0c43b36961897c23d3dbdce4.tar.bz2 | |
gxx-include-dir.m4: In all substitutions, leave $(gcc_version) to be expanded by the Makefile.
config:
* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
libjava:
* configure.ac: Do not invoke TL_AC_GCC_VERSION. Do not
set tool_include_dir. In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
* aclocal.m4, configure: Regenerate.
* Makefile.am: Set gcc_version. Replace all uses of
@gcc_version@ with $(gcc_version).
* external/Makefile.am, external/sax/Makefile.am
* external/w3c_dom/Makefile.am, gcj/Makefile.am
* testsuite/Makefile.am: Set gcc_version.
* include/Makefile.am: Set gcc_version and tool_include_dir.
* Makefile.in, external/Makefile.in, external/sax/Makefile.in
* external/w3c_dom/Makefile.in, gcj/Makefile.in, include/Makefile.in
* testsuite/Makefile.in: Regenerate.
From-SVN: r96825
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/Makefile.am | 4 | ||||
| -rw-r--r-- | libjava/include/Makefile.in | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/libjava/include/Makefile.am b/libjava/include/Makefile.am index 089884b..f255311 100644 --- a/libjava/include/Makefile.am +++ b/libjava/include/Makefile.am @@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign +# May be used by various substitution variables. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ +tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include tool_include__HEADERS = jni.h jawt.h jawt_md.h jvmpi.h diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 17f6d2b..56280f3 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -41,16 +41,14 @@ subdir = include DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(tool_include__HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/pkg.m4 \ - $(top_srcdir)/../config/accross.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \ $(top_srcdir)/../config/acx.m4 \ - $(top_srcdir)/../config/gcc-version.m4 \ $(top_srcdir)/../config/gxx-include-dir.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lcmessage.m4 \ $(top_srcdir)/../config/lib-ld.m4 \ $(top_srcdir)/../config/lib-link.m4 \ - $(top_srcdir)/../config/lib-prefix.m4 \ + $(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \ $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac @@ -256,9 +254,6 @@ build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ -gcc_version = @gcc_version@ -gcc_version_full = @gcc_version_full@ -gcc_version_trigger = @gcc_version_trigger@ gxx_include_dir = @gxx_include_dir@ here = @here@ host = @host@ @@ -294,11 +289,14 @@ target_noncanonical = @target_noncanonical@ target_os = @target_os@ target_subdir = @target_subdir@ target_vendor = @target_vendor@ -tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ toolexecmainlibdir = @toolexecmainlibdir@ 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.h jawt.h jawt_md.h jvmpi.h all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am |