FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/47174 (libquadmath: Build now depends on makeinfo)

Browse source 
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.

From-SVN: r168555
This commit is contained in:
Ralf Wildenhues 2011-01-06 22:09:41 +00:00 • committed by Ralf Wildenhues
parent 3728af1405
commit a6098a2827
4 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libquadmath/ChangeLog
View file

@ -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> 2010-12-19 Tobias Burnus <burnus@net-b.de>
PR fortran/46520 PR fortran/46520

8
libquadmath/Makefile.am
View file

@ -126,8 +126,6 @@ stamp-geninsrc: libquadmath.info
cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info
@touch $@ @touch $@
libquadmath.info: $(STAMP_BUILD_INFO)
stamp-build-info: libquadmath.texi stamp-build-info: libquadmath.texi
$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi
@touch $@ @touch $@
@ -135,7 +133,11 @@ stamp-build-info: libquadmath.texi
CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libquadmath.info CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libquadmath.info
MAINTAINERCLEANFILES = $(srcdir)/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: # Automake Documentation:

24
libquadmath/Makefile.in
View file

@ -843,24 +843,6 @@ distclean-multi:
maintainer-clean-multi: maintainer-clean-multi:
$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE) $(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 libquadmath.dvi: libquadmath.texi
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ 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@ cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info
@BUILD_LIBQUADMATH_TRUE@ @touch $@ @BUILD_LIBQUADMATH_TRUE@ @touch $@
@BUILD_LIBQUADMATH_TRUE@libquadmath.info: $(STAMP_BUILD_INFO)
@BUILD_LIBQUADMATH_TRUE@stamp-build-info: libquadmath.texi @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@ $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi
@BUILD_LIBQUADMATH_TRUE@ @touch $@ @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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

2
libquadmath/configure.ac
View file

@ -26,7 +26,7 @@ ACX_NONCANONICAL_TARGET
target_alias=${target_alias-$host_alias} target_alias=${target_alias-$host_alias}
AC_SUBST(target_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_MSG_CHECKING([for --enable-version-specific-runtime-libs])
AC_ARG_ENABLE(version-specific-runtime-libs, AC_ARG_ENABLE(version-specific-runtime-libs,