aboutsummaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2009-08-22 12:43:24 +0000
committerRalf Wildenhues <rwild@gcc.gnu.org>2009-08-22 12:43:24 +0000
commit84fec8a53729e1cc4a4243d10575285a4138cfe3 (patch)
treedbca9c0b63a0a6b0fbfe0697e6a57ec3e8e27604 /libgfortran
parent0539cb2c6f944ae4434f4033a12d42eabebf543d (diff)
downloadgcc-84fec8a53729e1cc4a4243d10575285a4138cfe3.zip
gcc-84fec8a53729e1cc4a4243d10575285a4138cfe3.tar.gz
gcc-84fec8a53729e1cc4a4243d10575285a4138cfe3.tar.bz2
LIBTOOLFLAGS, and *_LINK fixes for Automake 1.11
boehm-gc/: * Makefile.am (LTCOMPILE, LTLINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * Makefile.in: Regenerate. libgfortran/: * Makefile.am (libgfortran_la_LINK): Add $(libgfortran_la_LDFLAGS). * Makefile.in: Regenerate. libjava/: * Makefile.am (libgcj_la_LINK, libgcj_tools_la_LINK) (lib_gnu_awt_xlib_la_LINK, libgcj_bc_la_LINK, jv_convert_LINK) (gcj_dbtool_LINK, gc_analyze_LINK, gij_LINK, ecjx_LINK) (gappletviewer_LINK, gjarsigner_LINK, gkeytool_LINK) (gjar_LINK, gjavah_LINK, gcjh_LINK, gnative2ascii_LINK) (gorbd_LINK, grmid_LINK, gserialver_LINK, gtnameserv_LINK) (grmic_LINK, grmiregistry_LINK, gjdoc_LINK): Add $(gjdoc_LDFLAGS). (GCJLINK, LIBLINK, CXXLINK): Add $(LIBTOOLFLAGS). * Makefile.in: Regenerate. libstdc++-v3/: * libsupc++/Makefile.am (LTCOMPILE, LTCXXCOMPILE, CXXLINK): Add $(LIBTOOLFLAGS). * libsupc++/Makefile.in: Regenerate. * src/Makefile.am (LTCXXCOMPILE, CXXLINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * src/Makefile.in: Regenerate. libgomp/: * Makefile.am (LINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * Makefile.in: Regenerate. libobjc/: * Makefile.in (LIBTOOL): Add $(LIBTOOLFLAGS). From-SVN: r151013
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/Makefile.am2
-rw-r--r--libgfortran/Makefile.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index b22306f..1a5597b 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * Makefile.am (libgfortran_la_LINK): Add $(libgfortran_la_LDFLAGS).
+ * Makefile.in: Regenerate.
+
2009-08-20 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/40962
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 35e0a3d..7127d66 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -17,7 +17,7 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
-no-undefined -bindir "$(bindir)"
toolexeclib_LTLIBRARIES = libgfortran.la
-libgfortran_la_LINK = $(LINK)
+libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS)
libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) -lm $(extra_ldflags_libgfortran) $(version_arg)
myexeclib_LTLIBRARIES = libgfortranbegin.la
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index ca995f7..4bdb406 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -961,7 +961,7 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
-no-undefined -bindir "$(bindir)"
toolexeclib_LTLIBRARIES = libgfortran.la
-libgfortran_la_LINK = $(LINK)
+libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS)
libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) -lm $(extra_ldflags_libgfortran) $(version_arg)
myexeclib_LTLIBRARIES = libgfortranbegin.la
myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)