From: rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 6 Jan 2011 22:09:41 +0000 (+0000)
Subject: Fix PR fortran/47174
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=d7887345bbbd0706739f99941ef3b9c0318b0cdd;hp=269faf4f359ed72f70586bb295f4112d2eba4107

Fix PR fortran/47174

libquadmath/:
	PR fortran/47174
	* Makefile.am (libquadmath.info): Unconditionally override
	target, not only if BUILD_LIBQUADMATH.
	* Makefile.in: Regenerate.
	* configure.ac (AM_INIT_AUTOMAKE): Add -Wno-override option to
	avoid warning from automake.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168555 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index e87d14a2ebb..146e02e60a8 100644
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR fortran/47174
+	* Makefile.am (libquadmath.info): Unconditionally override
+	target, not only if BUILD_LIBQUADMATH.
+	* Makefile.in: Regenerate.
+	* configure.ac (AM_INIT_AUTOMAKE): Add -Wno-override option to
+	avoid warning from automake.
+
 2010-12-19  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/46520
diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am
index e9071237755..83eb749dcc2 100644
--- a/libquadmath/Makefile.am
+++ b/libquadmath/Makefile.am
@@ -126,8 +126,6 @@ stamp-geninsrc: libquadmath.info
 	cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info
 	@touch $@
 
-libquadmath.info: $(STAMP_BUILD_INFO)
-
 stamp-build-info: libquadmath.texi
 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi
 	@touch $@
@@ -135,7 +133,11 @@ stamp-build-info: libquadmath.texi
 CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libquadmath.info
 MAINTAINERCLEANFILES = $(srcdir)/libquadmath.info
 
-endif
+endif BUILD_LIBQUADMATH
+
+# Unconditionally override this target, so that automake's definition
+# does not wrongly interfere.
+libquadmath.info: $(STAMP_BUILD_INFO)
 
 
 # Automake Documentation:
diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 7b2b699b8d9..b2b64ad2918 100644
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -843,24 +843,6 @@ distclean-multi:
 maintainer-clean-multi:
 	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
 
-@BUILD_LIBQUADMATH_FALSE@libquadmath.info: libquadmath.texi 
-@BUILD_LIBQUADMATH_FALSE@	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
-@BUILD_LIBQUADMATH_FALSE@	rm -rf $$backupdir && mkdir $$backupdir && \
-@BUILD_LIBQUADMATH_FALSE@	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
-@BUILD_LIBQUADMATH_FALSE@	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-@BUILD_LIBQUADMATH_FALSE@	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-@BUILD_LIBQUADMATH_FALSE@	  done; \
-@BUILD_LIBQUADMATH_FALSE@	else :; fi && \
-@BUILD_LIBQUADMATH_FALSE@	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-@BUILD_LIBQUADMATH_FALSE@	 -o $@ `test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi; \
-@BUILD_LIBQUADMATH_FALSE@	then \
-@BUILD_LIBQUADMATH_FALSE@	  rc=0; \
-@BUILD_LIBQUADMATH_FALSE@	else \
-@BUILD_LIBQUADMATH_FALSE@	  rc=$$?; \
-@BUILD_LIBQUADMATH_FALSE@	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
-@BUILD_LIBQUADMATH_FALSE@	fi; \
-@BUILD_LIBQUADMATH_FALSE@	rm -rf $$backupdir; exit $$rc
-
 libquadmath.dvi: libquadmath.texi  
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
@@ -1288,12 +1270,14 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
 @BUILD_LIBQUADMATH_TRUE@	cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info
 @BUILD_LIBQUADMATH_TRUE@	@touch $@
 
-@BUILD_LIBQUADMATH_TRUE@libquadmath.info: $(STAMP_BUILD_INFO)
-
 @BUILD_LIBQUADMATH_TRUE@stamp-build-info: libquadmath.texi
 @BUILD_LIBQUADMATH_TRUE@	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi
 @BUILD_LIBQUADMATH_TRUE@	@touch $@
 
+# Unconditionally override this target, so that automake's definition
+# does not wrongly interfere.
+libquadmath.info: $(STAMP_BUILD_INFO)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libquadmath/configure.ac b/libquadmath/configure.ac
index 68b5cf8924c..568b36a3072 100644
--- a/libquadmath/configure.ac
+++ b/libquadmath/configure.ac
@@ -26,7 +26,7 @@ ACX_NONCANONICAL_TARGET
 target_alias=${target_alias-$host_alias}
 AC_SUBST(target_alias)
 
-AM_INIT_AUTOMAKE([1.9.0 foreign subdir-objects no-dist -Wall -Werror])
+AM_INIT_AUTOMAKE([1.9.0 foreign subdir-objects no-dist -Wall -Wno-override -Werror])
 
 AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
 AC_ARG_ENABLE(version-specific-runtime-libs,