diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-08-22 12:43:24 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-08-22 12:43:24 +0000 |
| commit | 60598a3af9ba4d8820cd3a4573f446e4be8da3c0 (patch) | |
| tree | dbca9c0b63a0a6b0fbfe0697e6a57ec3e8e27604 /libgomp | |
| parent | f0c89091eecbba9b514286df92e46a94ef56473f (diff) | |
| download | gcc-60598a3af9ba4d8820cd3a4573f446e4be8da3c0.tar.gz | |
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).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151013 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/Makefile.am | 4 | ||||
| -rw-r--r-- | libgomp/Makefile.in | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 4a6c3087195..0c47fdc6df5 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * Makefile.am (LINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). + * Makefile.in: Regenerate. + 2009-08-20 Dave Korn <dave.korn.cygwin@gmail.com> * Makefile.am (libgomp_la_LDFLAGS): Add -bindir flag. diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index 154b28931dd..2ef2f7ec93b 100644 --- a/libgomp/Makefile.am +++ b/libgomp/Makefile.am @@ -43,8 +43,8 @@ endif LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) -LINK = $(LIBTOOL) --tag CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ omp_lib_kinds.mod: omp_lib.mod : diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index a9c8ba43079..d484d506191 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -316,8 +316,8 @@ nodist_noinst_HEADERS = libgomp_f.h nodist_libsubinclude_HEADERS = omp.h @USE_FORTRAN_TRUE@nodist_finclude_HEADERS = omp_lib.h omp_lib.f90 omp_lib.mod omp_lib_kinds.mod LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) -LINK = $(LIBTOOL) --tag CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ # Automake Documentation: |