From f5fd0999b0796d293514a8a16a4ad4c1cbab63b9 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 24 Aug 2015 01:12:38 -0700 Subject: [PATCH] Correct the WRAPPER_EXTRA_LDFLAGS --- ompi/debuggers/Makefile.am | 4 +++- test/datatype/Makefile.am | 17 +++++++++-------- test/event/Makefile.am | 7 ++++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ompi/debuggers/Makefile.am b/ompi/debuggers/Makefile.am index 3e48af84c8..93a3046755 100644 --- a/ompi/debuggers/Makefile.am +++ b/ompi/debuggers/Makefile.am @@ -10,6 +10,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2007-2015 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2015 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -43,13 +44,14 @@ headers = \ # Simple checks to ensure that the DSOs are functional dlopen_test_SOURCES = dlopen_test.c +dlopen_test_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) dlopen_test_LDADD = \ $(top_builddir)/ompi/libmpi.la \ $(top_builddir)/opal/libopen-pal.la dlopen_test_DEPENDENCIES = $(ompi_predefined_LDADD) predefined_gap_test_SOURCES = predefined_gap_test.c -predefined_gap_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +predefined_gap_test_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) predefined_gap_test_LDADD = $(top_builddir)/ompi/libmpi.la predefined_gap_test_DEPENDENCIES = $(ompi_predefined_LDADD) diff --git a/test/datatype/Makefile.am b/test/datatype/Makefile.am index 5d814906e9..7683c34c46 100644 --- a/test/datatype/Makefile.am +++ b/test/datatype/Makefile.am @@ -4,6 +4,7 @@ # reserved. # Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. +# Copyright (c) 2015 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,46 +21,46 @@ TESTS = opal_datatype_test $(MPI_TESTS) check_PROGRAMS = $(TESTS) $(MPI_CHECKS) ddt_test_SOURCES = ddt_test.c ddt_lib.c ddt_lib.h -ddt_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +ddt_test_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) ddt_test_LDADD = \ $(top_builddir)/ompi/libmpi.la \ $(top_builddir)/opal/libopen-pal.la ddt_raw_SOURCES = ddt_raw.c ddt_lib.c ddt_lib.h -ddt_raw_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +ddt_raw_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) ddt_raw_LDADD = \ $(top_builddir)/ompi/libmpi.la \ $(top_builddir)/opal/libopen-pal.la ddt_pack_SOURCES = ddt_pack.c -ddt_pack_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +ddt_pack_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) ddt_pack_LDADD = \ $(top_builddir)/ompi/libmpi.la \ $(top_builddir)/opal/libopen-pal.la checksum_SOURCES = checksum.c -checksum_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +checksum_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) checksum_LDADD = \ $(top_builddir)/ompi/libmpi.la \ $(top_builddir)/opal/libopen-pal.la position_SOURCES = position.c -position_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +position_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) position_LDADD = \ $(top_builddir)/ompi/libmpi.la \ $(top_builddir)/opal/libopen-pal.la position_noncontig_SOURCES = position_noncontig.c -position_noncontig_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +position_noncontig_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) position_noncontig_LDADD = \ $(top_builddir)/ompi/libmpi.la \ $(top_builddir)/opal/libopen-pal.la to_self_SOURCES = to_self.c -to_self_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +to_self_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) to_self_LDADD = $(top_builddir)/ompi/libmpi.la opal_datatype_test_SOURCES = opal_datatype_test.c opal_ddt_lib.c opal_ddt_lib.h -opal_datatype_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +opal_datatype_test_LDFLAGS = $(OMPI_WRAPPER_EXTRA_LDFLAGS) opal_datatype_test_LDADD = $(top_builddir)/opal/libopen-pal.la diff --git a/test/event/Makefile.am b/test/event/Makefile.am index da0381ceb8..168d6bf79c 100644 --- a/test/event/Makefile.am +++ b/test/event/Makefile.am @@ -9,6 +9,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2015 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -26,19 +27,19 @@ check_PROGRAMS = \ TESTS = $(check_PROGRAMS) signal_test_SOURCES = signal-test.c -signal_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +signal_test_LDFLAGS = $(OPAL_WRAPPER_EXTRA_LDFLAGS) signal_test_LDADD = \ $(top_builddir)/opal/libopen-pal.la signal_test_DEPENDENCIES = $(signal_test_LDADD) time_test_SOURCES = time-test.c -time_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +time_test_LDFLAGS = $(OPAL_WRAPPER_EXTRA_LDFLAGS) time_test_LDADD = \ $(top_builddir)/opal/libopen-pal.la time_test_DEPENDENCIES = $(time_test_LDADD) event_test_SOURCES = event-test.c -event_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +event_test_LDFLAGS = $(OPAL_WRAPPER_EXTRA_LDFLAGS) event_test_LDADD = \ $(top_builddir)/opal/libopen-pal.la event_test_DEPENDENCIES = $(event_test_LDADD)