test Makefile.am: fix flags

WRAPPER_EXTRA_LDFLAGS is both no longer used, and even if we fixed to
use the new names (i.e., <PACKAGE>_WRAPPER_EXTRA_LDFLAGS), it contains
a token that will not be understandable in Makefile.ams: @{libdir}.

Hence, update all instances to use <PACKAGE>_PKG_CONFIG_LDFLAGS, which
does not contain the @{libdir} token.  See comment in
opal_setup_wrappers.m4 for an explanation.

test/datatype/Makefile.am

@@ -22,52 +22,52 @@ TESTS = opal_datatype_test $(MPI_TESTS)
 check_PROGRAMS = $(TESTS) $(MPI_CHECKS)
 
 unpack_ooo_SOURCES = unpack_ooo.c ddt_lib.c ddt_lib.h
-unpack_ooo_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+unpack_ooo_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 unpack_ooo_LDADD = \
         $(top_builddir)/ompi/libmpi.la \
         $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 
 ddt_test_SOURCES = ddt_test.c ddt_lib.c ddt_lib.h
-ddt_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+ddt_test_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 ddt_test_LDADD = \
         $(top_builddir)/ompi/libmpi.la \
         $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 
 ddt_raw_SOURCES = ddt_raw.c ddt_lib.c ddt_lib.h
-ddt_raw_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+ddt_raw_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 ddt_raw_LDADD = \
         $(top_builddir)/ompi/libmpi.la \
         $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 
 ddt_pack_SOURCES = ddt_pack.c
-ddt_pack_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+ddt_pack_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 ddt_pack_LDADD = \
         $(top_builddir)/ompi/libmpi.la \
         $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 
 checksum_SOURCES = checksum.c
-checksum_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+checksum_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 checksum_LDADD = \
         $(top_builddir)/ompi/libmpi.la \
         $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 
 position_SOURCES = position.c
-position_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+position_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 position_LDADD = \
         $(top_builddir)/ompi/libmpi.la \
         $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 
 position_noncontig_SOURCES = position_noncontig.c
-position_noncontig_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+position_noncontig_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 position_noncontig_LDADD = \
         $(top_builddir)/ompi/libmpi.la \
         $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 
 to_self_SOURCES = to_self.c
-to_self_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+to_self_LDFLAGS = $(OMPI_PKG_CONFIG_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_PKG_CONFIG_LDFLAGS)
 opal_datatype_test_LDADD = \
         $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

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 Cisco Systems, 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_PKG_CONFIG_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_PKG_CONFIG_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_PKG_CONFIG_LDFLAGS)
 event_test_LDADD = \
         $(top_builddir)/opal/libopen-pal.la
 event_test_DEPENDENCIES = $(event_test_LDADD)

test/memchecker/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 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -28,33 +29,33 @@ TESTS = \
 	$(check_PROGRAMS)
 
 access_buffer_test_SOURCES = access_buffer_test.c
-access_buffer_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+access_buffer_test_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 access_buffer_test_LDADD = \
         $(top_builddir)/ompi/libmpi.la
 access_buffer_test_DEPENDENCIES = $(access_buffer_test_LDADD)
 
 irecv_init_check_SOURCES = irecv_init_check.c
-irecv_init_check_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+irecv_init_check_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 irecv_init_check_LDADD = \
         $(top_builddir)/ompi/libmpi.la
 irecv_init_check_DEPENDENCIES = $(irecv_init_check_LDADD)
 
 
 irecv_uninit_check_SOURCES = irecv_uninit_check.c
-irecv_uninit_check_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+irecv_uninit_check_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 irecv_uninit_check_LDADD = \
         $(top_builddir)/ompi/libmpi.la
 irecv_uninit_check_DEPENDENCIES = $(irecv_uninit_check_LDADD)
 
 non_blocking_send_test_SOURCES = non_blocking_send_test.c
-non_blocking_send_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+non_blocking_send_test_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 non_blocking_send_test_LDADD = \
         $(top_builddir)/ompi/libmpi.la
 non_blocking_send_test_DEPENDENCIES = $(non_blocking_send_test_LDADD)
 
 
 non_blocking_recv_test_SOURCES = non_blocking_recv_test.c
-non_blocking_recv_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+non_blocking_recv_test_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 non_blocking_recv_test_LDADD = \
         $(top_builddir)/ompi/libmpi.la
 non_blocking_recv_test_DEPENDENCIES = $(non_blocking_recv_test_LDADD)