diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 12 | ||||
| -rw-r--r-- | libjava/Makefile.in | 6 | ||||
| -rwxr-xr-x | libjava/configure | 124 | ||||
| -rw-r--r-- | libjava/configure.ac | 15 | ||||
| -rw-r--r-- | libjava/external/Makefile.in | 4 | ||||
| -rw-r--r-- | libjava/external/sax/Makefile.in | 4 | ||||
| -rw-r--r-- | libjava/external/w3c_dom/Makefile.in | 4 | ||||
| -rw-r--r-- | libjava/gcj/Makefile.in | 4 | ||||
| -rw-r--r-- | libjava/include/Makefile.in | 4 | ||||
| -rw-r--r-- | libjava/testsuite/Makefile.in | 4 |
10 files changed, 111 insertions, 70 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c6b5ef9..0f02171 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,15 @@ +2005-02-28 Paolo Bonzini <bonzini@gnu.org> + + PR bootstrap/17383 + * configure.ac: Call GCC_TOPLEV_SUBDIRS. + (COMPPATH): Removed. + (ZIP, GCJH): Replace it with ../$(host_subdir). + (built_gcc_dir): Add $(host_subdir). + * configure: Regenerate. + * Makefile.in, include/Makefile.in, testsuite/Makefile.in, + gcj/Makefile.in, external/Makefile.in, external/sax/Makefile.in, + external/w3c_dom/Makefile.in: Regenerate. + 2005-02-24 David Gilbert <david.gilbert@object-refinery.com> * java/awt/font/TextAttribute.java: changed names to lower case; diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 1f6e71f..4e114c7 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -4859,7 +4859,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -5020,6 +5019,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -5032,6 +5032,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -5058,6 +5059,7 @@ target_cpu = @target_cpu@ # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ @@ -17156,6 +17158,8 @@ mostlyclean-compile: -rm -f gnu/java/nio/ChannelInputStream.lo -rm -f gnu/java/nio/ChannelOutputStream.$(OBJEXT) -rm -f gnu/java/nio/ChannelOutputStream.lo + -rm -f gnu/java/nio/ChannelReader.$(OBJEXT) + -rm -f gnu/java/nio/ChannelReader.lo -rm -f gnu/java/nio/DatagramChannelImpl.$(OBJEXT) -rm -f gnu/java/nio/DatagramChannelImpl.lo -rm -f gnu/java/nio/DatagramChannelSelectionKey.$(OBJEXT) diff --git a/libjava/configure b/libjava/configure index 7dee1e0..f8fb203 100755 --- a/libjava/configure +++ b/libjava/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcj_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs COMPPATH TESTSUBDIR_TRUE TESTSUBDIR_FALSE ONESTEP_TRUE ONESTEP_FALSE LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE gcc_version_trigger gcc_version_full gcc_version tool_include_dir LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES here LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ONESTEP_TRUE ONESTEP_FALSE LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE gcc_version_trigger gcc_version_full gcc_version tool_include_dir LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES here LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1361,39 +1361,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# We use these options to decide which functions to include. - -# Check whether --with-target-subdir or --without-target-subdir was given. -if test "${with_target_subdir+set}" = set; then - withval="$with_target_subdir" - -fi; - -# We may get other options which we don't document: -# --with-target-subdir, --with-multisrctop, --with-multisubdir - -# When building with srcdir == objdir, links to the source files will -# be created in directories within the target_subdir. We have to -# adjust toplevel_srcdir accordingly, so that configure finds -# install-sh and other auxiliary files that live in the top-level -# source directory. -if test "${srcdir}" = "."; then - if test -z "${with_target_subdir}"; then - toprel=".." - else - if test "${with_target_subdir}" != "."; then - toprel="${with_multisrctop}../.." - else - toprel="${with_multisrctop}.." - fi - fi -else - toprel=".." -fi - -libgcj_basedir=$srcdir/$toprel/./libjava - - ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1451,6 +1418,67 @@ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + case ${build_alias} in + "") build_noncanonical=${build} ;; + *) build_noncanonical=${build_alias} ;; +esac + + case ${host_alias} in + "") host_noncanonical=${build_noncanonical} ;; + *) host_noncanonical=${host_alias} ;; +esac + + case ${target_alias} in + "") target_noncanonical=${host_noncanonical} ;; + *) target_noncanonical=${target_alias} ;; +esac + + # Prefix 'build-' so this never conflicts with target_subdir. +build_subdir="build-${build_noncanonical}" +# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories +if ( test $srcdir = . && test -d gcc ) \ + || test -d $srcdir/../host-${host_noncanonical}; then + host_subdir="host-${host_noncanonical}" +else + host_subdir=. +fi +# No prefix. +target_subdir=${target_noncanonical} + + +# We use these options to decide which functions to include. + +# Check whether --with-target-subdir or --without-target-subdir was given. +if test "${with_target_subdir+set}" = set; then + withval="$with_target_subdir" + +fi; + +# We may get other options which we don't document: +# --with-target-subdir, --with-multisrctop, --with-multisubdir + +# When building with srcdir == objdir, links to the source files will +# be created in directories within the target_subdir. We have to +# adjust toplevel_srcdir accordingly, so that configure finds +# install-sh and other auxiliary files that live in the top-level +# source directory. +if test "${srcdir}" = "."; then + if test -z "${with_target_subdir}"; then + toprel=".." + else + if test "${with_target_subdir}" != "."; then + toprel="${with_multisrctop}../.." + else + toprel="${with_multisrctop}.." + fi + fi +else + toprel=".." +fi + +libgcj_basedir=$srcdir/$toprel/./libjava + + echo "$as_me:$LINENO: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then @@ -1506,11 +1534,6 @@ test -n "$target_alias" && *) build_noncanonical=${build_alias} ;; esac - case ${host_alias} in - "") host_noncanonical=${build_noncanonical} ;; - *) host_noncanonical=${host_alias} ;; -esac - case ${target_alias} in "") target_noncanonical=${host_noncanonical} ;; *) target_noncanonical=${target_alias} ;; @@ -4743,7 +4766,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4746 "configure"' > conftest.$ac_ext + echo '#line 4769 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5581,13 +5604,6 @@ fi subdirs="$subdirs libltdl" -if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then - COMPPATH=. -else - COMPPATH=.. -fi - - # The -no-testsuite modules omit the test subdir. @@ -5774,7 +5790,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 5777 "configure" +#line 5793 "configure" struct S { ~S(); }; void bar(); void foo() @@ -13278,7 +13294,7 @@ NATIVE=yes # Which gcj do we use? which_gcj=default -built_gcc_dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`" +built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`" if test -n "${with_cross_host}"; then # We are being configured with a cross compiler. We can't # use ac_exeext, because that is for the target platform. @@ -13317,8 +13333,8 @@ fi case "${which_gcj}" in built) GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" - GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh' - ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' + GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh' + ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar' ;; cross) if test "x${with_newlib}" = "xyes"; then @@ -16558,11 +16574,14 @@ s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t -s,@libgcj_basedir@,$libgcj_basedir,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t s,@build_os@,$build_os,;t t +s,@build_subdir@,$build_subdir,;t t +s,@host_subdir@,$host_subdir,;t t +s,@target_subdir@,$target_subdir,;t t +s,@libgcj_basedir@,$libgcj_basedir,;t t s,@host@,$host,;t t s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t @@ -16642,7 +16661,6 @@ s,@GCJDEPMODE@,$GCJDEPMODE,;t t s,@am__fastdepGCJ_TRUE@,$am__fastdepGCJ_TRUE,;t t s,@am__fastdepGCJ_FALSE@,$am__fastdepGCJ_FALSE,;t t s,@subdirs@,$subdirs,;t t -s,@COMPPATH@,$COMPPATH,;t t s,@TESTSUBDIR_TRUE@,$TESTSUBDIR_TRUE,;t t s,@TESTSUBDIR_FALSE@,$TESTSUBDIR_FALSE,;t t s,@ONESTEP_TRUE@,$ONESTEP_TRUE,;t t diff --git a/libjava/configure.ac b/libjava/configure.ac index c7da4f5..6fcfe6d 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -5,6 +5,8 @@ AC_INIT([libjava], [version-unused],, [libjava]) AC_CONFIG_SRCDIR(java/lang/System.java) +GCC_TOPLEV_SUBDIRS + # We use these options to decide which functions to include. AC_ARG_WITH(target-subdir, AS_HELP_STRING([--with-target-subdir=SUBDIR], @@ -162,13 +164,6 @@ AM_PROG_GCJ AM_PROG_CC_C_O AC_CONFIG_SUBDIRS(libltdl) -if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then - COMPPATH=. -else - COMPPATH=.. -fi -AC_SUBST(COMPPATH) - # The -no-testsuite modules omit the test subdir. AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite) @@ -1039,7 +1034,7 @@ NATIVE=yes # Which gcj do we use? which_gcj=default -built_gcc_dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`" +built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`" if test -n "${with_cross_host}"; then # We are being configured with a cross compiler. We can't # use ac_exeext, because that is for the target platform. @@ -1078,8 +1073,8 @@ fi case "${which_gcj}" in built) GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" - GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh' - ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' + GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh' + ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar' ;; cross) if test "x${with_newlib}" = "xyes"; then diff --git a/libjava/external/Makefile.in b/libjava/external/Makefile.in index a35f042..a265571 100644 --- a/libjava/external/Makefile.in +++ b/libjava/external/Makefile.in @@ -87,7 +87,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -248,6 +247,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -260,6 +260,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -284,6 +285,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ diff --git a/libjava/external/sax/Makefile.in b/libjava/external/sax/Makefile.in index a4b95da..f8bd002 100644 --- a/libjava/external/sax/Makefile.in +++ b/libjava/external/sax/Makefile.in @@ -124,7 +124,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -285,6 +284,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -297,6 +297,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -321,6 +322,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ diff --git a/libjava/external/w3c_dom/Makefile.in b/libjava/external/w3c_dom/Makefile.in index 56842d9..9545a9c 100644 --- a/libjava/external/w3c_dom/Makefile.in +++ b/libjava/external/w3c_dom/Makefile.in @@ -218,7 +218,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -379,6 +378,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -391,6 +391,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -415,6 +416,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index dc528b0..38bcaf3 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -92,7 +92,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -253,6 +252,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -265,6 +265,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -291,6 +292,7 @@ target_cpu = @target_cpu@ # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 4c05fce..49db7d0 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -91,7 +91,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -252,6 +251,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -264,6 +264,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -290,6 +291,7 @@ target_cpu = @target_cpu@ # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 4ba07e5..129f381 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -80,7 +80,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -241,6 +240,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -253,6 +253,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -279,6 +280,7 @@ target_cpu = @target_cpu@ # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ |