From 4144e65853590932ad57077392916203b690f8a9 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 19 Nov 2010 12:13:13 +0000 Subject: [PATCH] Makefile.am (libquadmath_la_LIBADD): Move -lm ... * Makefile.am (libquadmath_la_LIBADD): Move -lm ... (libquadmath_la_LDFLAGS): ... here. (quadmath.map-sun): Tabify. Fix sed expression. * Makefile.in: Regenerate. From-SVN: r166937 --- libquadmath/ChangeLog | 8 ++++++++ libquadmath/Makefile.am | 19 +++++++++---------- libquadmath/Makefile.in | 21 ++++++++++----------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog index 687d32d9f60..4a4d3069fda 100644 --- a/libquadmath/ChangeLog +++ b/libquadmath/ChangeLog @@ -1,3 +1,11 @@ +2010-11-19 Rainer Orth + + * Makefile.am (libquadmath_la_LIBADD): Move -lm ... + (libquadmath_la_LDFLAGS): ... here. + (quadmath.map-sun): Tabify. + Fix sed expression. + * Makefile.in: Regenerate. + 2010-11-16 Francois-Xavier Coudert Tobias Burnus diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am index 667b9baf66a..5f65a6643bd 100644 --- a/libquadmath/Makefile.am +++ b/libquadmath/Makefile.am @@ -20,14 +20,13 @@ if LIBQUAD_USE_SYMVER_SUN version_arg = -Wl,-M,quadmath.map-sun version_dep = quadmath.map-sun quadmath.map-sun : $(srcdir)/quadmath.map \ - $(top_srcdir)/../contrib/make_sunver.pl \ - $(libquadmath_la_OBJECTS) $(libquadmath_la_LIBADD) - perl $(top_srcdir)/../contrib/make_sunver.pl \ - $(srcdir)/quadmath.map \ - $(libquadmath_la_OBJECTS:%.lo=.libs/%.o) \ - `echo $(libquadmath_la_LIBADD) | \ - sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \ - > $@ || (rm -f $@ ; exit 1) + $(top_srcdir)/../contrib/make_sunver.pl \ + $(libquadmath_la_OBJECTS) $(libquadmath_la_LIBADD) + perl $(top_srcdir)/../contrib/make_sunver.pl \ + $(srcdir)/quadmath.map \ + `echo $(libquadmath_la_OBJECTS) $(libquadmath_la_LIBADD) | \ + sed 's,\([^/ ]*\)\.l\([ao]\),.libs/\1.\2,g'` \ + > $@ || (rm -f $@ ; exit 1) endif else version_arg = @@ -39,8 +38,8 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ toolexeclib_LTLIBRARIES = libquadmath.la -libquadmath_la_LIBADD = -lm -libquadmath_la_LDFLAGS = $(LTLDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) +libquadmath_la_LIBADD = +libquadmath_la_LDFLAGS = $(LTLDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) -lm libquadmath_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) libquadmath_la_DEPENDENCIES = $(version_dep) diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in index 8033ff938c4..0f6cbffa599 100644 --- a/libquadmath/Makefile.in +++ b/libquadmath/Makefile.in @@ -38,7 +38,7 @@ host_triplet = @host@ target_triplet = @target@ @BUILD_LIBQUADMATH_FALSE@libquadmath_la_DEPENDENCIES = subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ $(srcdir)/../depcomp $(am__include_HEADERS_DIST) @@ -281,8 +281,8 @@ AUTOMAKE_OPTIONS = 1.8 foreign @BUILD_LIBQUADMATH_TRUE@ -no-undefined @BUILD_LIBQUADMATH_TRUE@toolexeclib_LTLIBRARIES = libquadmath.la -@BUILD_LIBQUADMATH_TRUE@libquadmath_la_LIBADD = -lm -@BUILD_LIBQUADMATH_TRUE@libquadmath_la_LDFLAGS = $(LTLDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) +@BUILD_LIBQUADMATH_TRUE@libquadmath_la_LIBADD = +@BUILD_LIBQUADMATH_TRUE@libquadmath_la_LDFLAGS = $(LTLDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) -lm @BUILD_LIBQUADMATH_TRUE@libquadmath_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) @BUILD_LIBQUADMATH_TRUE@libquadmath_la_DEPENDENCIES = $(version_dep) @BUILD_LIBQUADMATH_TRUE@include_HEADERS = quadmath.h quadmath_weak.h @@ -967,14 +967,13 @@ uninstall-am: uninstall-includeHEADERS \ uninstall-toolexeclibLTLIBRARIES @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@quadmath.map-sun : $(srcdir)/quadmath.map \ -@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ $(top_srcdir)/../contrib/make_sunver.pl \ -@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ $(libquadmath_la_OBJECTS) $(libquadmath_la_LIBADD) -@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ perl $(top_srcdir)/../contrib/make_sunver.pl \ -@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ $(srcdir)/quadmath.map \ -@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ $(libquadmath_la_OBJECTS:%.lo=.libs/%.o) \ -@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ `echo $(libquadmath_la_LIBADD) | \ -@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \ -@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ > $@ || (rm -f $@ ; exit 1) +@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ $(top_srcdir)/../contrib/make_sunver.pl \ +@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ $(libquadmath_la_OBJECTS) $(libquadmath_la_LIBADD) +@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ perl $(top_srcdir)/../contrib/make_sunver.pl \ +@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ $(srcdir)/quadmath.map \ +@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ `echo $(libquadmath_la_OBJECTS) $(libquadmath_la_LIBADD) | \ +@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ sed 's,\([^/ ]*\)\.l\([ao]\),.libs/\1.\2,g'` \ +@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ > $@ || (rm -f $@ ; exit 1) # 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. -- 2.30.2