monitoring lib: fix some Makefile.am macros

* Use the proper lib prefix name * Use the proper extra LDFLAGS
open-mpi · Feb 24, 2016 · 2044ade · 2044ade
1 parent 727f309
commit 2044ade
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/test/monitoring/Makefile.am b/test/monitoring/Makefile.am
@@ -18,19 +18,19 @@
 if PROJECT_OMPI
     noinst_PROGRAMS = monitoring_test
     monitoring_test_SOURCES = monitoring_test.c
-    monitoring_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+    monitoring_test_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
     monitoring_test_LDADD = \
-        $(top_builddir)/ompi/libmpi.la \
-        $(top_builddir)/opal/libopen-pal.la
+        $(top_builddir)/ompi/lib@OPAL_LIB_PREFIX@mpi.la \
+        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 
 if MCA_BUILD_ompi_pml_monitoring_DSO
     lib_LTLIBRARIES = ompi_monitoring_prof.la
     ompi_monitoring_prof_la_SOURCES = monitoring_prof.c
     ompi_monitoring_prof_la_LDFLAGS= \
-        -module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
+        -module -avoid-version -shared $(OMPI_PKG_CONFIG_LDFLAGS)
     ompi_monitoring_prof_la_LIBADD = \
-        $(top_builddir)/ompi/libmpi.la \
-        $(top_builddir)/opal/libopen-pal.la
+        $(top_builddir)/ompi/lib@OPAL_LIB_PREFIX@mpi.la \
+        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 endif # MCA_BUILD_ompi_pml_monitoring_DSO
 
 endif # PROJECT_OMPI