From 479c15c22a62528830a64fed4e8ae8f5456354bb Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 9 Jun 2009 14:37:31 +0000 Subject: [PATCH] Makefile.am (LTLDFLAGS): Define. * Makefile.am (LTLDFLAGS): Define. (LINK): Define. * Makefile.in: Regenerate. From-SVN: r148311 --- libgomp/ChangeLog | 6 ++++++ libgomp/Makefile.am | 5 +++++ libgomp/Makefile.in | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 65144c311018..63295bf4b095 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2009-06-09 Nathan Froyd + + * Makefile.am (LTLDFLAGS): Define. + (LINK): Define. + * Makefile.in: Regenerate. + 2009-05-27 Janne Blomqvist PR fortran/39718 diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index d1967a0280b0..ebb4b6ab8f76 100644 --- a/libgomp/Makefile.am +++ b/libgomp/Makefile.am @@ -41,6 +41,11 @@ if USE_FORTRAN nodist_finclude_HEADERS = omp_lib.h omp_lib.f90 omp_lib.mod omp_lib_kinds.mod endif +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) + +LINK = $(LIBTOOL) --tag CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ + omp_lib_kinds.mod: omp_lib.mod : omp_lib.mod: omp_lib.f90 diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index fe709e827342..a1e3afc484b5 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -97,8 +97,6 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libgomp_la_SOURCES) DIST_SOURCES = $(libgomp_la_SOURCES) MULTISRCTOP = @@ -317,6 +315,9 @@ libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \ 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 $@ # Automake Documentation: # If your package has Texinfo files in many directories, you can use the