Skip to content

Commit

Permalink
libjava/classpath: Bump to automake 1.11.6
Browse files Browse the repository at this point in the history
2015-05-13  Michael Haubenwallner  <[email protected]>

	 * Makefile.in: Regenerated with automake-1.11.6.
	 * aclocal.m4: Likewise.
	 * configure: Likewise.
	 * doc/Makefile.in: Likewise.
	 * doc/api/Makefile.in: Likewise.
	 * examples/Makefile.in: Likewise.
	 * external/Makefile.in: Likewise.
	 * external/jsr166/Makefile.in: Likewise.
	 * external/relaxngDatatype/Makefile.in: Likewise.
	 * external/sax/Makefile.in: Likewise.
	 * external/w3c_dom/Makefile.in: Likewise.
	 * include/Makefile.in: Likewise.
	 * lib/Makefile.in: Likewise.
	 * native/Makefile.in: Likewise.
	 * native/fdlibm/Makefile.in: Likewise.
	 * native/jawt/Makefile.in: Likewise.
	 * native/jni/Makefile.in: Likewise.
	 * native/jni/classpath/Makefile.in: Likewise.
	 * native/jni/gconf-peer/Makefile.in: Likewise.
	 * native/jni/gstreamer-peer/Makefile.in: Likewise.
	 * native/jni/gtk-peer/Makefile.in: Likewise.
	 * native/jni/java-io/Makefile.in: Likewise.
	 * native/jni/java-lang/Makefile.in: Likewise.
	 * native/jni/java-math/Makefile.in: Likewise.
	 * native/jni/java-net/Makefile.in: Likewise.
	 * native/jni/java-nio/Makefile.in: Likewise.
	 * native/jni/java-util/Makefile.in: Likewise.
	 * native/jni/midi-alsa/Makefile.in: Likewise.
	 * native/jni/midi-dssi/Makefile.in: Likewise.
	 * native/jni/native-lib/Makefile.in: Likewise.
	 * native/jni/qt-peer/Makefile.in: Likewise.
	 * native/jni/xmlj/Makefile.in: Likewise.
	 * native/plugin/Makefile.in: Likewise.
	 * resource/Makefile.in: Likewise.
	 * scripts/Makefile.in: Likewise.
	 * tools/Makefile.in: Likewise.

From-SVN: r223135
  • Loading branch information
haubi authored and Michael Haubenwallner committed May 13, 2015
1 parent 8f3a6a0 commit 7521f82
Show file tree
Hide file tree
Showing 37 changed files with 1,509 additions and 381 deletions.
39 changes: 39 additions & 0 deletions libjava/classpath/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
2015-05-13 Michael Haubenwallner <[email protected]>

* Makefile.in: Regenerated with automake-1.11.6.
* aclocal.m4: Likewise.
* configure: Likewise.
* doc/Makefile.in: Likewise.
* doc/api/Makefile.in: Likewise.
* examples/Makefile.in: Likewise.
* external/Makefile.in: Likewise.
* external/jsr166/Makefile.in: Likewise.
* external/relaxngDatatype/Makefile.in: Likewise.
* external/sax/Makefile.in: Likewise.
* external/w3c_dom/Makefile.in: Likewise.
* include/Makefile.in: Likewise.
* lib/Makefile.in: Likewise.
* native/Makefile.in: Likewise.
* native/fdlibm/Makefile.in: Likewise.
* native/jawt/Makefile.in: Likewise.
* native/jni/Makefile.in: Likewise.
* native/jni/classpath/Makefile.in: Likewise.
* native/jni/gconf-peer/Makefile.in: Likewise.
* native/jni/gstreamer-peer/Makefile.in: Likewise.
* native/jni/gtk-peer/Makefile.in: Likewise.
* native/jni/java-io/Makefile.in: Likewise.
* native/jni/java-lang/Makefile.in: Likewise.
* native/jni/java-math/Makefile.in: Likewise.
* native/jni/java-net/Makefile.in: Likewise.
* native/jni/java-nio/Makefile.in: Likewise.
* native/jni/java-util/Makefile.in: Likewise.
* native/jni/midi-alsa/Makefile.in: Likewise.
* native/jni/midi-dssi/Makefile.in: Likewise.
* native/jni/native-lib/Makefile.in: Likewise.
* native/jni/qt-peer/Makefile.in: Likewise.
* native/jni/xmlj/Makefile.in: Likewise.
* native/plugin/Makefile.in: Likewise.
* resource/Makefile.in: Likewise.
* scripts/Makefile.in: Likewise.
* tools/Makefile.in: Likewise.

2014-11-09 H.J. Lu <[email protected]>

PR bootstrap/63784
Expand Down
43 changes: 35 additions & 8 deletions libjava/classpath/Makefile.in
Original file line number Diff line number Diff line change
@@ -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@

# 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.
Expand All @@ -15,6 +15,23 @@

@SET_MAKE@
VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
Expand Down Expand Up @@ -94,6 +111,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
Expand Down Expand Up @@ -332,7 +354,7 @@ DISTCHECK_CONFIGURE_FLAGS = --with-gjdoc --enable-gstreamer-peer \
all: all-recursive

.SUFFIXES:
am--refresh:
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
Expand Down Expand Up @@ -552,10 +574,15 @@ install-am: all-am

installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
install; \
else \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:

clean-generic:
Expand Down
Loading

0 comments on commit 7521f82

Please sign in to comment.