From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 39659 invoked by alias); 6 May 2015 09:38:30 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 39636 invoked by uid 89); 6 May 2015 09:38:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=2.2 required=5.0 tests=AWL,BAYES_99,BAYES_999,KAM_ASCII_DIVIDERS,SPF_PASS autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 3 recipients X-HELO: smtp.salomon.at Received: from smtp.salomon.at (HELO smtp.salomon.at) (193.186.16.13) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 06 May 2015 09:38:15 +0000 Received: from samail03.wamas.com ([172.28.2.2] helo=mailhost.salomon.at) by smtp.salomon.at with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1YpvmA-0002hV-9D; Wed, 06 May 2015 11:37:58 +0200 Received: from [172.28.53.61] by mailhost.salomon.at with esmtps (TLSv1:AES128-SHA:128) (Exim 4.77) (envelope-from ) id 1Ypvm7-0003An-HX; Wed, 06 May 2015 11:37:57 +0200 Message-ID: <5549E0F2.8060007@ssi-schaefer.com> Date: Wed, 06 May 2015 09:38:00 -0000 From: Michael Haubenwallner User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Paolo Bonzini , DJ Delorie , Nathanael Nerode , Alexandre Oliva , Ralf Wildenhues CC: Jan-Benedict Glaw , GCC Patches , Bernd Edlinger , Janne Blomqvist , Kai Tietz Subject: [patch 17/28] classpath: Use automake-1.11.6 References: <5548E9C3.1090408@ssi-schaefer.com> In-Reply-To: <5548E9C3.1090408@ssi-schaefer.com> Content-Type: multipart/mixed; boundary="------------090303040505090802000204" X-Spam-Note: SpamAssassin run bypassed due to message size X-SW-Source: 2015-05/txt/msg00410.txt.bz2 This is a multi-part message in MIME format. --------------090303040505090802000204 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 158 Am 2015-05-05 um 18:03 schrieb Michael Haubenwallner: > Now that gcc-5 is out, what about an automake-1.11.6 update for gcc-6? Patch for libjava/classpath. --------------090303040505090802000204 Content-Type: text/x-patch; name="libjava.classpath.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="libjava.classpath.patch" Content-length: 162565 2015-05-06 Michael Haubenwallner Use automake-1.11.6. INSTALL: Recreate. Makefile.in: Recreate. aclocal.m4: Recreate. configure: Recreate. doc/Makefile.in: Recreate. doc/api/Makefile.in: Recreate. examples/Makefile.in: Recreate. external/Makefile.in: Recreate. external/jsr166/Makefile.in: Recreate. external/relaxngDatatype/Makefile.in: Recreate. external/sax/Makefile.in: Recreate. external/w3c_dom/Makefile.in: Recreate. include/Makefile.in: Recreate. lib/Makefile.in: Recreate. native/Makefile.in: Recreate. native/fdlibm/Makefile.in: Recreate. native/jawt/Makefile.in: Recreate. native/jni/Makefile.in: Recreate. native/jni/classpath/Makefile.in: Recreate. native/jni/gconf-peer/Makefile.in: Recreate. native/jni/gstreamer-peer/Makefile.in: Recreate. native/jni/gtk-peer/Makefile.in: Recreate. native/jni/java-io/Makefile.in: Recreate. native/jni/java-lang/Makefile.in: Recreate. native/jni/java-math/Makefile.in: Recreate. native/jni/java-net/Makefile.in: Recreate. native/jni/java-nio/Makefile.in: Recreate. native/jni/java-util/Makefile.in: Recreate. native/jni/midi-alsa/Makefile.in: Recreate. native/jni/midi-dssi/Makefile.in: Recreate. native/jni/native-lib/Makefile.in: Recreate. native/jni/qt-peer/Makefile.in: Recreate. native/jni/xmlj/Makefile.in: Recreate. native/plugin/Makefile.in: Recreate. resource/Makefile.in: Recreate. scripts/Makefile.in: Recreate. tools/Makefile.in: Recreate. Index: libjava/classpath/INSTALL =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/INSTALL (revision 222804) +++ libjava/classpath/INSTALL (working copy) @@ -1,8 +1,8 @@ Installation Instructions ************************* =20 -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. =20 Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ =20 and if that doesn't work, install pre-built binaries of GCC for HP-UX. =20 + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended Index: libjava/classpath/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/Makefile.in (revision 222804) +++ libjava/classpath/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -35,9 +52,10 @@ host_triplet =3D @host@ target_triplet =3D @target@ subdir =3D . -DIST_COMMON =3D INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ +DIST_COMMON =3D INSTALL INSTALL NEWS NEWS README README AUTHORS AUTHORS \ + ChangeLog ChangeLog $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(srcdir)/../../mkinstalldirs \ $(srcdir)/../../mkinstalldirs \ $(top_srcdir)/gnu/classpath/Configuration.java.in \ $(top_srcdir)/gnu/java/security/Configuration.java.in \ @@ -94,6 +112,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS =3D mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS =3D $(RECURSIVE_TARGETS:-recursive=3D) \ @@ -332,7 +355,7 @@ all: all-recursive =20 .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am_= _configure_deps) @for dep in $?; do \ @@ -552,10 +575,15 @@ =20 installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/aclocal.m4 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/aclocal.m4 (revision 222804) +++ libjava/classpath/aclocal.m4 (working copy) @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- =20 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,12 +20,15 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreco= nf'.])]) =20 -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundati= on, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -34,7 +38,7 @@ [am__api_version=3D'1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) =20 @@ -50,7 +54,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -57,12 +61,14 @@ =20 # AM_AUX_DIR_EXPAND -*- Autoconf -= *- =20 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -110,13 +116,13 @@ =20 # AM_COND_IF -*- Autoconf -*- =20 -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 -# serial 1 +# serial 3 =20 # _AM_COND_IF # _AM_COND_ELSE @@ -130,15 +136,15 @@ =20 # AM_COND_IF(COND, [IF-TRUE], [IF-FALSE]) # --------------------------------------- -# If the shell condition matching COND is true, execute IF-TRUE, -# otherwise execute IF-FALSE. Allow automake to learn about conditional -# instantiating macros (the AC_CONFIG_FOOS). +# If the shell condition COND is true, execute IF-TRUE, otherwise execute +# IF-FALSE. Allow automake to learn about conditional instantiating macros +# (the AC_CONFIG_FOOS). AC_DEFUN([AM_COND_IF], [m4_ifndef([_AM_COND_VALUE_$1], [m4_fatal([$0: no such condition "$1"])])dnl _AM_COND_IF([$1])dnl -if _AM_COND_VALUE_$1; then - m4_default([$2], [:]) +if test -z "$$1_TRUE"; then : + m4_n([$2])[]dnl m4_ifval([$3], [_AM_COND_ELSE([$1])dnl else @@ -184,14 +190,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) =20 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 -# serial 10 +# serial 12 =20 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -231,6 +237,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -295,7 +302,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -360,10 +367,13 @@ if test "x$enable_dependency_tracking" !=3D xno; then am_depcomp=3D"$ac_aux_dir/depcomp" AMDEPBACKSLASH=3D'\' + am__nodep=3D'_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" !=3D xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) =20 # Generate code to set up dependency tracking. -*- Autoconf -= *- @@ -585,12 +595,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_st= amp_count]) =20 -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -609,8 +622,8 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -= *- # From Jim Meyering =20 -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -630,7 +643,7 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: = $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portio= ns of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefil= es]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rul= es and dependencies not useful @@ -776,12 +789,15 @@ fi ]) =20 -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -804,13 +820,14 @@ =20 # Helper functions for option handling. -*- Autoconf -= *- =20 -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, In= c. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 -# serial 4 +# serial 5 =20 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -818,13 +835,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) =20 # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this opt= ion. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) =20 # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -835,12 +852,14 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) =20 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 +# serial 1 + # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -917,12 +936,14 @@ fi AC_MSG_RESULT(yes)]) =20 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -945,13 +966,13 @@ INSTALL_STRIP_PROGRAM=3D"\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) =20 -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. =20 -# serial 2 +# serial 3 =20 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -960,13 +981,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) =20 # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) =20 # Check how to create a tarball. -*- Autoconf -= *- =20 -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -988,10 +1009,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar=3D'${AMTAR} chof - "$$tardir"'; am__untar=3D'${AMTAR} xf -'], + [am__tar=3D'$${TAR-tar} chof - "$$tardir"' am__untar=3D'$${TAR-tar} x= f -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) Index: libjava/classpath/configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/configure (revision 222804) +++ libjava/classpath/configure (working copy) @@ -767,6 +767,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -3659,11 +3660,11 @@ =20 # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR=3D'$${TAR-tar}' =20 -AMTAR=3D${AMTAR-"${am_missing_run}tar"} =20 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar ta= r archive" >&5 $as_echo_n "checking how to create a ustar tar archive... " >&6; } # Loop over all known methods to create a tar archive until one works. @@ -3978,6 +3979,7 @@ if test "x$enable_dependency_tracking" !=3D xno; then am_depcomp=3D"$ac_aux_dir/depcomp" AMDEPBACKSLASH=3D'\' + am__nodep=3D'_no' fi if test "x$enable_dependency_tracking" !=3D xno; then AMDEP_TRUE=3D @@ -4795,6 +4797,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4854,7 +4857,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -11879,7 +11882,7 @@ lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2 lt_status=3D$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11882 "configure" +#line 11885 "configure" #include "confdefs.h" =20 #if HAVE_DLFCN_H @@ -11985,7 +11988,7 @@ lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2 lt_status=3D$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11988 "configure" +#line 11991 "configure" #include "confdefs.h" =20 #if HAVE_DLFCN_H @@ -12817,6 +12820,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -12876,7 +12880,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -13464,6 +13468,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -13523,7 +13528,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -25359,7 +25364,7 @@ JAVA_TEST=3DObject.java CLASS_TEST=3DObject.class cat << \EOF > $JAVA_TEST -/* #line 25362 "configure" */ +/* #line 25367 "configure" */ package java.lang; =20 public class Object @@ -25452,7 +25457,7 @@ if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=3Dyes else - echo "configure: 25455: uudecode had trouble decoding base 64 file= 'Test.uue'" >&5 + echo "configure: 25460: uudecode had trouble decoding base 64 file= 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=3Dno @@ -25480,7 +25485,7 @@ CLASS_TEST=3DTest.class TEST=3DTest cat << \EOF > $JAVA_TEST -/* [#]line 25483 "configure" */ +/* [#]line 25488 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -25688,7 +25693,7 @@ JAVA_TEST=3DTest.java CLASS_TEST=3DTest.class cat << \EOF > $JAVA_TEST - /* #line 25691 "configure" */ + /* #line 25696 "configure" */ public class Test { public static void main(String args) @@ -25835,9 +25840,8 @@ ac_config_files=3D"$ac_config_files Makefile doc/Makefile doc/api/Makefile= external/Makefile external/sax/Makefile external/w3c_dom/Makefile external= /relaxngDatatype/Makefile external/jsr166/Makefile gnu/classpath/Configurat= ion.java gnu/java/security/Configuration.java include/Makefile native/Makef= ile native/fdlibm/Makefile native/jawt/Makefile native/jni/Makefile native/= jni/classpath/Makefile native/jni/java-io/Makefile native/jni/java-lang/Mak= efile native/jni/java-math/Makefile native/jni/java-net/Makefile native/jni= /java-nio/Makefile native/jni/java-util/Makefile native/jni/gtk-peer/Makefi= le native/jni/gconf-peer/Makefile native/jni/gstreamer-peer/Makefile native= /jni/qt-peer/Makefile native/jni/xmlj/Makefile native/jni/midi-alsa/Makefil= e native/jni/midi-dssi/Makefile native/jni/native-lib/Makefile native/plugi= n/Makefile resource/Makefile resource/META-INF/services/java.util.prefs.Pre= ferencesFactory resource/META-INF/services/javax.sound.sampled.spi.AudioFil= eReader resource/META-INF/services/javax.sound.sampled.spi.MixerProvider sc= ripts/Makefile scripts/classpath.spec lib/Makefile lib/gen-classlist.sh lib= /copy-vmresources.sh scripts/check_jni_methods.sh tools/Makefile examples/M= akefile examples/Makefile.jawt examples/Makefile.java2d" =20 =20 -if test "x${COMPILE_WRAPPERS}" =3D xyes; then - : -else +if test -z "$CREATE_WRAPPERS_TRUE"; then : + else ac_config_files=3D"$ac_config_files tools/gappletviewer tools/gjarsigner= tools/gkeytool tools/gjar tools/gnative2ascii tools/gserialver tools/grmir= egistry tools/gtnameserv tools/gorbd tools/grmid tools/grmic tools/gjavah" =20 =20 Index: libjava/classpath/doc/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/doc/Makefile.in (revision 222804) +++ libjava/classpath/doc/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -86,6 +103,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__installdirs =3D "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" am__vpath_adj_setup =3D srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj =3D case $$p in \ @@ -108,6 +130,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir =3D $(mandir)/man1 NROFF =3D nroff MANS =3D $(man_MANS) @@ -484,9 +512,7 @@ =20 uninstall-info-am: @$(PRE_UNINSTALL) - @if test -d '$(DESTDIR)$(infodir)' && \ - (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null= 2>&1; then \ + @if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \ list=3D'$(INFO_DEPS)'; \ for file in $$list; do \ relfile=3D`echo "$$file" | sed 's|^.*/||'`; \ @@ -560,11 +586,18 @@ done install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=3D''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2=3D'$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=3D''; \ + list2=3D'$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=3D; else d=3D"$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -593,9 +626,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir=3D'$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) =20 # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -749,10 +780,15 @@ =20 installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: @@ -793,8 +829,11 @@ =20 install-dvi-am: $(DVIS) @$(NORMAL_INSTALL) - test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" @list=3D'$(DVIS)'; test -n "$(dvidir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -809,18 +848,22 @@ =20 install-html-am: $(HTMLS) @$(NORMAL_INSTALL) - test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" @list=3D'$(HTMLS)'; list2=3D; test -n "$(htmldir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p" || test -d "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi= ; \ $(am__strip_dir) \ - if test -d "$$d$$p"; then \ + d2=3D$$d$$p; \ + if test -d "$$d2"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ - echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ + echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ else \ - list2=3D"$$list2 $$d$$p"; \ + list2=3D"$$list2 $$d2"; \ fi; \ done; \ test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ @@ -832,9 +875,12 @@ =20 install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) - test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" @srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; \ list=3D'$(INFO_DEPS)'; test -n "$(infodir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \ + fi; \ for file in $$list; do \ case $$file in \ $(srcdir)/*) file=3D`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ @@ -852,8 +898,7 @@ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done @$(POST_INSTALL) - @if (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null= 2>&1; then \ + @if $(am__can_run_installinfo); then \ list=3D'$(INFO_DEPS)'; test -n "$(infodir)" || list=3D; \ for file in $$list; do \ relfile=3D`echo "$$file" | sed 's|^.*/||'`; \ @@ -867,8 +912,11 @@ =20 install-pdf-am: $(PDFS) @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" @list=3D'$(PDFS)'; test -n "$(pdfdir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -880,8 +928,11 @@ =20 install-ps-am: $(PSS) @$(NORMAL_INSTALL) - test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" @list=3D'$(PSS)'; test -n "$(psdir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ echo "$$d$$p"; \ Index: libjava/classpath/doc/api/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/doc/api/Makefile.in (revision 222804) +++ libjava/classpath/doc/api/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -68,6 +85,11 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA =3D $(noinst_DATA) ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ @@ -345,10 +367,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: @@ -360,8 +387,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@CREATE_API_DOCS_FALSE@install-data-local: @CREATE_API_DOCS_FALSE@uninstall-local: -@CREATE_API_DOCS_FALSE@install-data-local: clean: clean-am =20 clean-am: clean-generic clean-libtool clean-local mostlyclean-am Index: libjava/classpath/examples/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/examples/Makefile.in (revision 222804) +++ libjava/classpath/examples/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -69,6 +86,11 @@ CONFIG_CLEAN_FILES =3D Makefile.jawt Makefile.java2d CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup =3D srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj =3D case $$p in \ $(srcdir)/*) f=3D`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -90,6 +112,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(exampledir)" DATA =3D $(example_DATA) ACLOCAL =3D @ACLOCAL@ @@ -396,8 +424,11 @@ -rm -rf .libs _libs install-exampleDATA: $(example_DATA) @$(NORMAL_INSTALL) - test -z "$(exampledir)" || $(MKDIR_P) "$(DESTDIR)$(exampledir)" @list=3D'$(example_DATA)'; test -n "$(exampledir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(exampledir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(exampledir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -411,9 +442,7 @@ @$(NORMAL_UNINSTALL) @list=3D'$(example_DATA)'; test -n "$(exampledir)" || list=3D; \ files=3D`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(exampledir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(exampledir)" && rm -f $$files + dir=3D'$(DESTDIR)$(exampledir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: =20 @@ -439,10 +468,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/external/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/external/Makefile.in (revision 222804) +++ libjava/classpath/external/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -74,6 +91,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS =3D mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS =3D $(RECURSIVE_TARGETS:-recursive=3D) \ @@ -486,10 +508,15 @@ =20 installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/external/jsr166/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/external/jsr166/Makefile.in (revision 222804) +++ libjava/classpath/external/jsr166/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -67,6 +84,11 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ ANTLR =3D @ANTLR@ @@ -413,10 +435,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/external/relaxngDatatype/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/external/relaxngDatatype/Makefile.in (revision 222804) +++ libjava/classpath/external/relaxngDatatype/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -67,6 +84,11 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ ANTLR =3D @ANTLR@ @@ -353,10 +375,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/external/sax/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/external/sax/Makefile.in (revision 222804) +++ libjava/classpath/external/sax/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -67,6 +84,11 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ ANTLR =3D @ANTLR@ @@ -381,10 +403,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/external/w3c_dom/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/external/w3c_dom/Makefile.in (revision 222804) +++ libjava/classpath/external/w3c_dom/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -67,6 +84,11 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ ANTLR =3D @ANTLR@ @@ -488,10 +510,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/include/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/include/Makefile.in (revision 222804) +++ libjava/classpath/include/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -68,6 +85,11 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ ANTLR =3D @ANTLR@ @@ -475,10 +497,8 @@ $(am__aclocal_m4_deps): =20 config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi =20 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -517,10 +537,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/lib/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/lib/Makefile.in (revision 222804) +++ libjava/classpath/lib/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -71,6 +88,11 @@ copy-vmresources.sh CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA =3D $(noinst_DATA) ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ @@ -371,10 +393,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/Makefile.in (revision 222804) +++ libjava/classpath/native/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -74,6 +91,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS =3D mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS =3D $(RECURSIVE_TARGETS:-recursive=3D) \ @@ -488,10 +510,15 @@ =20 installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/fdlibm/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/fdlibm/Makefile.in (revision 222804) +++ libjava/classpath/native/fdlibm/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -94,6 +111,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libfdlibm_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -414,7 +436,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libfdlibm.la: $(libfdlibm_la_OBJECTS) $(libfdlibm_la_DEPENDENCIES)=20 +libfdlibm.la: $(libfdlibm_la_OBJECTS) $(libfdlibm_la_DEPENDENCIES) $(EXTRA= _libfdlibm_la_DEPENDENCIES)=20 $(LINK) $(libfdlibm_la_OBJECTS) $(libfdlibm_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -568,10 +590,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jawt/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jawt/Makefile.in (revision 222804) +++ libjava/classpath/native/jawt/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libjawt_la_DEPENDENCIES =3D \ @@ -111,6 +134,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libjawt_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -375,7 +403,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -383,6 +410,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -404,7 +433,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libjawt.la: $(libjawt_la_OBJECTS) $(libjawt_la_DEPENDENCIES)=20 +libjawt.la: $(libjawt_la_OBJECTS) $(libjawt_la_DEPENDENCIES) $(EXTRA_libja= wt_la_DEPENDENCIES)=20 $(libjawt_la_LINK) -rpath $(nativeexeclibdir) $(libjawt_la_OBJECTS) $(lib= jawt_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -510,10 +539,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -74,6 +91,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS =3D mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS =3D $(RECURSIVE_TARGETS:-recursive=3D) \ @@ -500,10 +522,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/classpath/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/classpath/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/classpath/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -85,6 +102,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libclasspath_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -356,7 +378,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libclasspath.la: $(libclasspath_la_OBJECTS) $(libclasspath_la_DEPENDENCIES= )=20 +libclasspath.la: $(libclasspath_la_OBJECTS) $(libclasspath_la_DEPENDENCIES= ) $(EXTRA_libclasspath_la_DEPENDENCIES)=20 $(LINK) $(libclasspath_la_OBJECTS) $(libclasspath_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -460,10 +482,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/gconf-peer/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/gconf-peer/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/gconf-peer/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libgconfpeer_la_DEPENDENCIES =3D \ @@ -111,6 +134,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libgconfpeer_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -372,7 +400,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -380,6 +407,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -401,7 +430,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgconfpeer.la: $(libgconfpeer_la_OBJECTS) $(libgconfpeer_la_DEPENDENCIES= )=20 +libgconfpeer.la: $(libgconfpeer_la_OBJECTS) $(libgconfpeer_la_DEPENDENCIES= ) $(EXTRA_libgconfpeer_la_DEPENDENCIES)=20 $(libgconfpeer_la_LINK) -rpath $(nativeexeclibdir) $(libgconfpeer_la_OBJE= CTS) $(libgconfpeer_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -507,10 +536,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/gstreamer-peer/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/gstreamer-peer/Makefile.in (revision 22280= 4) +++ libjava/classpath/native/jni/gstreamer-peer/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libgstreamerpeer_la_DEPENDENCIES =3D \ @@ -113,6 +136,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libgstreamerpeer_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -392,7 +420,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -400,6 +427,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -421,7 +450,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgstreamerpeer.la: $(libgstreamerpeer_la_OBJECTS) $(libgstreamerpeer_la_= DEPENDENCIES)=20 +libgstreamerpeer.la: $(libgstreamerpeer_la_OBJECTS) $(libgstreamerpeer_la_= DEPENDENCIES) $(EXTRA_libgstreamerpeer_la_DEPENDENCIES)=20 $(libgstreamerpeer_la_LINK) -rpath $(nativeexeclibdir) $(libgstreamerpeer= _la_OBJECTS) $(libgstreamerpeer_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -532,10 +561,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/gtk-peer/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/gtk-peer/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/gtk-peer/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libgtkpeer_la_DEPENDENCIES =3D \ @@ -149,6 +172,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libgtkpeer_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -463,7 +491,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -471,6 +498,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -492,7 +521,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgtkpeer.la: $(libgtkpeer_la_OBJECTS) $(libgtkpeer_la_DEPENDENCIES)=20 +libgtkpeer.la: $(libgtkpeer_la_OBJECTS) $(libgtkpeer_la_DEPENDENCIES) $(EX= TRA_libgtkpeer_la_DEPENDENCIES)=20 $(libgtkpeer_la_LINK) -rpath $(nativeexeclibdir) $(libgtkpeer_la_OBJECTS)= $(libgtkpeer_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -638,10 +667,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/java-io/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/java-io/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/java-io/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libjavaio_la_DEPENDENCIES =3D \ @@ -110,6 +133,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libjavaio_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -376,7 +404,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -384,6 +411,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -405,7 +434,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libjavaio.la: $(libjavaio_la_OBJECTS) $(libjavaio_la_DEPENDENCIES)=20 +libjavaio.la: $(libjavaio_la_OBJECTS) $(libjavaio_la_DEPENDENCIES) $(EXTRA= _libjavaio_la_DEPENDENCIES)=20 $(LINK) -rpath $(nativeexeclibdir) $(libjavaio_la_OBJECTS) $(libjavaio_la= _LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -514,10 +543,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/java-lang/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/java-lang/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/java-lang/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libjavalang_la_DEPENDENCIES =3D \ @@ -122,6 +145,11 @@ SOURCES =3D $(libjavalang_la_SOURCES) \ $(libjavalangmanagement_la_SOURCES) \ $(libjavalangreflect_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -392,7 +420,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -400,6 +427,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -421,11 +450,11 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libjavalang.la: $(libjavalang_la_OBJECTS) $(libjavalang_la_DEPENDENCIES)=20 +libjavalang.la: $(libjavalang_la_OBJECTS) $(libjavalang_la_DEPENDENCIES) $= (EXTRA_libjavalang_la_DEPENDENCIES)=20 $(LINK) -rpath $(nativeexeclibdir) $(libjavalang_la_OBJECTS) $(libjavalan= g_la_LIBADD) $(LIBS) -libjavalangmanagement.la: $(libjavalangmanagement_la_OBJECTS) $(libjavalan= gmanagement_la_DEPENDENCIES)=20 +libjavalangmanagement.la: $(libjavalangmanagement_la_OBJECTS) $(libjavalan= gmanagement_la_DEPENDENCIES) $(EXTRA_libjavalangmanagement_la_DEPENDENCIES)= =20 $(LINK) -rpath $(nativeexeclibdir) $(libjavalangmanagement_la_OBJECTS) $(= libjavalangmanagement_la_LIBADD) $(LIBS) -libjavalangreflect.la: $(libjavalangreflect_la_OBJECTS) $(libjavalangrefle= ct_la_DEPENDENCIES)=20 +libjavalangreflect.la: $(libjavalangreflect_la_OBJECTS) $(libjavalangrefle= ct_la_DEPENDENCIES) $(EXTRA_libjavalangreflect_la_DEPENDENCIES)=20 $(LINK) -rpath $(nativeexeclibdir) $(libjavalangreflect_la_OBJECTS) $(lib= javalangreflect_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -537,10 +566,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/java-math/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/java-math/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/java-math/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libjavamath_la_DEPENDENCIES =3D \ @@ -111,6 +134,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libjavamath_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -370,7 +398,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -378,6 +405,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -399,7 +428,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libjavamath.la: $(libjavamath_la_OBJECTS) $(libjavamath_la_DEPENDENCIES)=20 +libjavamath.la: $(libjavamath_la_OBJECTS) $(libjavamath_la_DEPENDENCIES) $= (EXTRA_libjavamath_la_DEPENDENCIES)=20 $(libjavamath_la_LINK) -rpath $(nativeexeclibdir) $(libjavamath_la_OBJECT= S) $(libjavamath_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -505,10 +534,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/java-net/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/java-net/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/java-net/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) am__DEPENDENCIES_1 =3D @@ -116,6 +139,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libjavanet_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -391,7 +419,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -399,6 +426,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -420,7 +449,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libjavanet.la: $(libjavanet_la_OBJECTS) $(libjavanet_la_DEPENDENCIES)=20 +libjavanet.la: $(libjavanet_la_OBJECTS) $(libjavanet_la_DEPENDENCIES) $(EX= TRA_libjavanet_la_DEPENDENCIES)=20 $(LINK) -rpath $(nativeexeclibdir) $(libjavanet_la_OBJECTS) $(libjavanet_= la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -532,10 +561,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/java-nio/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/java-nio/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/java-nio/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) am__DEPENDENCIES_1 =3D @@ -118,6 +141,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libjavanio_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -394,7 +422,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -402,6 +429,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -423,7 +452,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libjavanio.la: $(libjavanio_la_OBJECTS) $(libjavanio_la_DEPENDENCIES)=20 +libjavanio.la: $(libjavanio_la_OBJECTS) $(libjavanio_la_DEPENDENCIES) $(EX= TRA_libjavanio_la_DEPENDENCIES)=20 $(LINK) -rpath $(nativeexeclibdir) $(libjavanio_la_OBJECTS) $(libjavanio_= la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -537,10 +566,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/java-util/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/java-util/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/java-util/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libjavautil_la_LIBADD =3D @@ -107,6 +130,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libjavautil_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -366,7 +394,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -374,6 +401,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -395,7 +424,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libjavautil.la: $(libjavautil_la_OBJECTS) $(libjavautil_la_DEPENDENCIES)=20 +libjavautil.la: $(libjavautil_la_OBJECTS) $(libjavautil_la_DEPENDENCIES) $= (EXTRA_libjavautil_la_DEPENDENCIES)=20 $(LINK) -rpath $(nativeexeclibdir) $(libjavautil_la_OBJECTS) $(libjavauti= l_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -501,10 +530,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/midi-alsa/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/midi-alsa/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/midi-alsa/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libgjsmalsa_la_DEPENDENCIES =3D @@ -113,6 +136,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libgjsmalsa_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -377,7 +405,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -385,6 +412,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -406,7 +435,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgjsmalsa.la: $(libgjsmalsa_la_OBJECTS) $(libgjsmalsa_la_DEPENDENCIES)=20 +libgjsmalsa.la: $(libgjsmalsa_la_OBJECTS) $(libgjsmalsa_la_DEPENDENCIES) $= (EXTRA_libgjsmalsa_la_DEPENDENCIES)=20 $(libgjsmalsa_la_LINK) -rpath $(nativeexeclibdir) $(libgjsmalsa_la_OBJECT= S) $(libgjsmalsa_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -514,10 +543,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/midi-dssi/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/midi-dssi/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/midi-dssi/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libgjsmdssi_la_DEPENDENCIES =3D \ @@ -113,6 +136,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libgjsmdssi_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -378,7 +406,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -386,6 +413,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -407,7 +436,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgjsmdssi.la: $(libgjsmdssi_la_OBJECTS) $(libgjsmdssi_la_DEPENDENCIES)=20 +libgjsmdssi.la: $(libgjsmdssi_la_OBJECTS) $(libgjsmdssi_la_DEPENDENCIES) $= (EXTRA_libgjsmdssi_la_DEPENDENCIES)=20 $(libgjsmdssi_la_LINK) -rpath $(nativeexeclibdir) $(libgjsmdssi_la_OBJECT= S) $(libgjsmdssi_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -514,10 +543,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/native-lib/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/native-lib/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/native-lib/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -85,6 +102,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libclasspathnative_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -358,7 +380,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libclasspathnative.la: $(libclasspathnative_la_OBJECTS) $(libclasspathnati= ve_la_DEPENDENCIES)=20 +libclasspathnative.la: $(libclasspathnative_la_OBJECTS) $(libclasspathnati= ve_la_DEPENDENCIES) $(EXTRA_libclasspathnative_la_DEPENDENCIES)=20 $(LINK) $(libclasspathnative_la_OBJECTS) $(libclasspathnative_la_LIBADD)= $(LIBS) =20 mostlyclean-compile: @@ -463,10 +485,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/qt-peer/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/qt-peer/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/qt-peer/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,6 +19,23 @@ # =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -115,6 +132,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libqtpeer_la_SOURCES) $(nodist_libqtpeer_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -449,7 +471,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libqtpeer.la: $(libqtpeer_la_OBJECTS) $(libqtpeer_la_DEPENDENCIES)=20 +libqtpeer.la: $(libqtpeer_la_OBJECTS) $(libqtpeer_la_DEPENDENCIES) $(EXTRA= _libqtpeer_la_DEPENDENCIES)=20 $(libqtpeer_la_LINK) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LI= BS) =20 mostlyclean-compile: @@ -594,10 +616,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/jni/xmlj/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/jni/xmlj/Makefile.in (revision 222804) +++ libjava/classpath/native/jni/xmlj/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libxmlj_la_DEPENDENCIES =3D $(top_builddir)/native/jni/classpath/jcl.lo @@ -109,6 +132,11 @@ --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libxmlj_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -387,7 +415,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -395,6 +422,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -416,7 +445,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libxmlj.la: $(libxmlj_la_OBJECTS) $(libxmlj_la_DEPENDENCIES)=20 +libxmlj.la: $(libxmlj_la_OBJECTS) $(libxmlj_la_DEPENDENCIES) $(EXTRA_libxm= lj_la_DEPENDENCIES)=20 $(LINK) -rpath $(nativeexeclibdir) $(libxmlj_la_OBJECTS) $(libxmlj_la_LIB= ADD) $(LIBS) =20 mostlyclean-compile: @@ -529,10 +558,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/native/plugin/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/native/plugin/Makefile.in (revision 222804) +++ libjava/classpath/native/plugin/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -88,6 +105,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(nativeexeclibdir)" LTLIBRARIES =3D $(nativeexeclib_LTLIBRARIES) libgcjwebplugin_la_LIBADD =3D @@ -111,6 +134,11 @@ --mode=3Dlink $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES =3D $(libgcjwebplugin_la_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS =3D etags CTAGS =3D ctags ACLOCAL =3D @ACLOCAL@ @@ -373,7 +401,6 @@ $(am__aclocal_m4_deps): install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(nativeexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir= )" @list=3D'$(nativeexeclib_LTLIBRARIES)'; test -n "$(nativeexeclibdir)" || = list=3D; \ list2=3D; for p in $$list; do \ if test -f $$p; then \ @@ -381,6 +408,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(nativeexeclibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(nativeexeclibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $= (INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nativeexeclibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INSTAL= L) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nativeexeclibdir)"; \ } @@ -402,7 +431,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgcjwebplugin.la: $(libgcjwebplugin_la_OBJECTS) $(libgcjwebplugin_la_DEP= ENDENCIES)=20 +libgcjwebplugin.la: $(libgcjwebplugin_la_OBJECTS) $(libgcjwebplugin_la_DEP= ENDENCIES) $(EXTRA_libgcjwebplugin_la_DEPENDENCIES)=20 $(libgcjwebplugin_la_LINK) -rpath $(nativeexeclibdir) $(libgcjwebplugin_l= a_OBJECTS) $(libgcjwebplugin_la_LIBADD) $(LIBS) =20 mostlyclean-compile: @@ -515,10 +544,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/resource/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/resource/Makefile.in (revision 222804) +++ libjava/classpath/resource/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -68,6 +85,11 @@ CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup =3D srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj =3D case $$p in \ $(srcdir)/*) f=3D`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -89,6 +111,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs =3D "$(DESTDIR)$(loggingdir)" "$(DESTDIR)$(securitydir)" DATA =3D $(logging_DATA) $(security_DATA) ACLOCAL =3D @ACLOCAL@ @@ -350,8 +378,11 @@ -rm -rf .libs _libs install-loggingDATA: $(logging_DATA) @$(NORMAL_INSTALL) - test -z "$(loggingdir)" || $(MKDIR_P) "$(DESTDIR)$(loggingdir)" @list=3D'$(logging_DATA)'; test -n "$(loggingdir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(loggingdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(loggingdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -365,13 +396,14 @@ @$(NORMAL_UNINSTALL) @list=3D'$(logging_DATA)'; test -n "$(loggingdir)" || list=3D; \ files=3D`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(loggingdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(loggingdir)" && rm -f $$files + dir=3D'$(DESTDIR)$(loggingdir)'; $(am__uninstall_files_from_dir) install-securityDATA: $(security_DATA) @$(NORMAL_INSTALL) - test -z "$(securitydir)" || $(MKDIR_P) "$(DESTDIR)$(securitydir)" @list=3D'$(security_DATA)'; test -n "$(securitydir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(securitydir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(securitydir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -385,9 +417,7 @@ @$(NORMAL_UNINSTALL) @list=3D'$(security_DATA)'; test -n "$(securitydir)" || list=3D; \ files=3D`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(securitydir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(securitydir)" && rm -f $$files + dir=3D'$(DESTDIR)$(securitydir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: =20 @@ -411,10 +441,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/scripts/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/scripts/Makefile.in (revision 222804) +++ libjava/classpath/scripts/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ =20 @SET_MAKE@ VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -68,6 +85,11 @@ CONFIG_CLEAN_FILES =3D classpath.spec check_jni_methods.sh CONFIG_CLEAN_VPATH_FILES =3D SOURCES =3D +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ ANTLR =3D @ANTLR@ @@ -346,10 +368,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: Index: libjava/classpath/tools/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- libjava/classpath/tools/Makefile.in (revision 222804) +++ libjava/classpath/tools/Makefile.in (working copy) @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ =20 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +18,23 @@ =20 =20 VPATH =3D @srcdir@ +am__make_dryrun =3D \ + { \ + am__dry=3Dno; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=3Dyes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=3D*|--*) ;; \ + *n*) am__dry=3Dyes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry =3D yes; \ + } pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ pkglibdir =3D $(libdir)/@PACKAGE@ @@ -202,6 +219,12 @@ am__base_list =3D \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } SCRIPTS =3D $(bin_SCRIPTS) $(noinst_SCRIPTS) DEFAULT_INCLUDES =3D -I.@am__isrc@ -I$(top_builddir)/include depcomp =3D $(SHELL) $(top_srcdir)/../../depcomp @@ -221,6 +244,11 @@ $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \ $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \ $(gserialver_SOURCES) $(gtnameserv_SOURCES) +am__can_run_installinfo =3D \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA =3D $(noinst_DATA) ETAGS =3D etags CTAGS =3D ctags @@ -758,8 +786,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list=3D'$(bin_PROGRAMS)'; test -n "$(bindir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -824,52 +855,55 @@ list=3D`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -@CREATE_WRAPPERS_TRUE@gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(g= appletviewer_DEPENDENCIES)=20 +@CREATE_WRAPPERS_TRUE@gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(g= appletviewer_DEPENDENCIES) $(EXTRA_gappletviewer_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gappletviewer$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gappletviewer_LINK) $(gappletviewer_OBJECTS) $(ga= ppletviewer_LDADD) $(LIBS) -@CREATE_WRAPPERS_TRUE@gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES)= =20 +@CREATE_WRAPPERS_TRUE@gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES) = $(EXTRA_gjar_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gjar$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gjar_LINK) $(gjar_OBJECTS) $(gjar_LDADD) $(LIBS) -@CREATE_WRAPPERS_TRUE@gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsig= ner_DEPENDENCIES)=20 +@CREATE_WRAPPERS_TRUE@gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsig= ner_DEPENDENCIES) $(EXTRA_gjarsigner_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gjarsigner$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gjarsigner_LINK) $(gjarsigner_OBJECTS) $(gjarsign= er_LDADD) $(LIBS) -@CREATE_WRAPPERS_TRUE@gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDEN= CIES)=20 +@CREATE_WRAPPERS_TRUE@gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDEN= CIES) $(EXTRA_gjavah_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gjavah$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gjavah_LINK) $(gjavah_OBJECTS) $(gjavah_LDADD) $(= LIBS) -@CREATE_GJDOC_FALSE@gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIES)= =20 +@CREATE_GJDOC_FALSE@gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIES)= $(EXTRA_gjdoc_DEPENDENCIES)=20 @CREATE_GJDOC_FALSE@ @rm -f gjdoc$(EXEEXT) @CREATE_GJDOC_FALSE@ $(gjdoc_LINK) $(gjdoc_OBJECTS) $(gjdoc_LDADD) $(LIBS) -@CREATE_WRAPPERS_TRUE@gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIE= S)=20 +@CREATE_WRAPPERS_TRUE@gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIE= S) $(EXTRA_gjdoc_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gjdoc$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gjdoc_LINK) $(gjdoc_OBJECTS) $(gjdoc_LDADD) $(LIB= S) -@CREATE_WRAPPERS_TRUE@gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DE= PENDENCIES)=20 +@CREATE_WRAPPERS_TRUE@gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DE= PENDENCIES) $(EXTRA_gkeytool_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gkeytool$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gkeytool_LINK) $(gkeytool_OBJECTS) $(gkeytool_LDA= DD) $(LIBS) -@CREATE_WRAPPERS_TRUE@gnative2ascii$(EXEEXT): $(gnative2ascii_OBJECTS) $(g= native2ascii_DEPENDENCIES)=20 +@CREATE_WRAPPERS_TRUE@gnative2ascii$(EXEEXT): $(gnative2ascii_OBJECTS) $(g= native2ascii_DEPENDENCIES) $(EXTRA_gnative2ascii_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gnative2ascii$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gnative2ascii_LINK) $(gnative2ascii_OBJECTS) $(gn= ative2ascii_LDADD) $(LIBS) -@CREATE_WRAPPERS_TRUE@gorbd$(EXEEXT): $(gorbd_OBJECTS) $(gorbd_DEPENDENCIE= S)=20 +@CREATE_WRAPPERS_TRUE@gorbd$(EXEEXT): $(gorbd_OBJECTS) $(gorbd_DEPENDENCIE= S) $(EXTRA_gorbd_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gorbd$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gorbd_LINK) $(gorbd_OBJECTS) $(gorbd_LDADD) $(LIB= S) -@CREATE_WRAPPERS_TRUE@grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIE= S)=20 +@CREATE_WRAPPERS_TRUE@grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIE= S) $(EXTRA_grmic_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f grmic$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(grmic_LINK) $(grmic_OBJECTS) $(grmic_LDADD) $(LIB= S) -@CREATE_WRAPPERS_TRUE@grmid$(EXEEXT): $(grmid_OBJECTS) $(grmid_DEPENDENCIE= S)=20 +@CREATE_WRAPPERS_TRUE@grmid$(EXEEXT): $(grmid_OBJECTS) $(grmid_DEPENDENCIE= S) $(EXTRA_grmid_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f grmid$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(grmid_LINK) $(grmid_OBJECTS) $(grmid_LDADD) $(LIB= S) -@CREATE_WRAPPERS_TRUE@grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grm= iregistry_DEPENDENCIES)=20 +@CREATE_WRAPPERS_TRUE@grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grm= iregistry_DEPENDENCIES) $(EXTRA_grmiregistry_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f grmiregistry$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(grmiregistry_LINK) $(grmiregistry_OBJECTS) $(grmi= registry_LDADD) $(LIBS) -@CREATE_WRAPPERS_TRUE@gserialver$(EXEEXT): $(gserialver_OBJECTS) $(gserial= ver_DEPENDENCIES)=20 +@CREATE_WRAPPERS_TRUE@gserialver$(EXEEXT): $(gserialver_OBJECTS) $(gserial= ver_DEPENDENCIES) $(EXTRA_gserialver_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gserialver$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gserialver_LINK) $(gserialver_OBJECTS) $(gserialv= er_LDADD) $(LIBS) -@CREATE_WRAPPERS_TRUE@gtnameserv$(EXEEXT): $(gtnameserv_OBJECTS) $(gtnames= erv_DEPENDENCIES)=20 +@CREATE_WRAPPERS_TRUE@gtnameserv$(EXEEXT): $(gtnameserv_OBJECTS) $(gtnames= erv_DEPENDENCIES) $(EXTRA_gtnameserv_DEPENDENCIES)=20 @CREATE_WRAPPERS_TRUE@ @rm -f gtnameserv$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(gtnameserv_LINK) $(gtnameserv_OBJECTS) $(gtnamese= rv_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list=3D'$(bin_SCRIPTS)'; test -n "$(bindir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -897,9 +931,7 @@ @list=3D'$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=3D`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir=3D'$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) =20 mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1200,10 +1232,15 @@ =20 installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D-s= \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ + "INSTALL_PROGRAM_ENV=3DSTRIPPROG=3D'$(STRIP)'" install; \ + fi mostlyclean-generic: =20 clean-generic: --------------090303040505090802000204--