From 384639c5cc1b18a83c399482bf2a0607cfa94917 Mon Sep 17 00:00:00 2001 From: Tim Prins Date: Tue, 26 Jul 2005 22:12:03 +0000 Subject: [PATCH] - more build system updates for bproc This commit was SVN r6609. --- orte/mca/pls/bproc/Makefile.am | 28 +++++++++++++++++++++--- orte/mca/pls/bproc/configure.m4 | 2 +- orte/mca/pls/bproc/pls_bproc_component.c | 6 ++--- orte/mca/pls/bproc_orted/Makefile.am | 28 +++++++++++++++++++++--- orte/mca/pls/bproc_orted/configure.m4 | 2 +- orte/mca/pls/bproc_seed/configure.m4 | 2 +- orte/mca/ras/bjs/configure.m4 | 2 +- orte/mca/ras/lsf_bproc/configure.m4 | 2 +- orte/mca/soh/bproc/configure.m4 | 2 +- 9 files changed, 58 insertions(+), 16 deletions(-) diff --git a/orte/mca/pls/bproc/Makefile.am b/orte/mca/pls/bproc/Makefile.am index 7c7b80339f..d08ff25bbb 100644 --- a/orte/mca/pls/bproc/Makefile.am +++ b/orte/mca/pls/bproc/Makefile.am @@ -16,10 +16,32 @@ include $(top_ompi_srcdir)/config/Makefile.options -AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include +AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include $(pls_bproc_CPPFLAGS) -noinst_LTLIBRARIES = libmca_pls_bproc.la -libmca_pls_bproc_la_SOURCES = \ +# Make the output library in this directory, and name it either +# mca__.la (for DSO builds) or libmca__.la +# (for static builds). + +if OMPI_BUILD_pls_bproc_DSO +component_noinst = +component_install = mca_pls_bproc.la +else +component_noinst = libmca_pls_bproc.la +component_install = +endif + +sources = \ pls_bproc.h \ pls_bproc.c \ pls_bproc_component.c + +mcacomponentdir = $(libdir)/openmpi +mcacomponent_LTLIBRARIES = $(component_install) +mca_pls_bproc_la_SOURCES = $(sources) +mca_pls_bproc_la_LIBADD = $(pls_bproc_LIBS) +mca_pls_bproc_la_LDFLAGS = -module -avoid-version $(pls_bproc_LDFLAGS) + +noinst_LTLIBRARIES = $(component_noinst) +libmca_pls_bproc_la_SOURCES = $(sources) +libmca_pls_bproc_la_LIBADD = $(pls_bproc_LIBS) +libmca_pls_bproc_la_LDFLAGS = -module -avoid-version $(pls_bproc_LDFLAGS) diff --git a/orte/mca/pls/bproc/configure.m4 b/orte/mca/pls/bproc/configure.m4 index 92a8703378..d77eda93f9 100644 --- a/orte/mca/pls/bproc/configure.m4 +++ b/orte/mca/pls/bproc/configure.m4 @@ -32,7 +32,7 @@ AC_DEFUN([MCA_pls_bproc_CONFIG],[ [AC_MSG_ERROR([Scyld bproc is not supported by the launching system yet])]) # set build flags to use in makefile - AC_SUBST([pls_bproc_OBJCFLAGS]) + AC_SUBST([pls_bproc_CPPFLAGS]) AC_SUBST([pls_bproc_LDFLAGS]) AC_SUBST([pls_bproc_LIBS]) ])dnl diff --git a/orte/mca/pls/bproc/pls_bproc_component.c b/orte/mca/pls/bproc/pls_bproc_component.c index 938fd8f2cd..9ab93b9e38 100644 --- a/orte/mca/pls/bproc/pls_bproc_component.c +++ b/orte/mca/pls/bproc/pls_bproc_component.c @@ -81,13 +81,11 @@ int orte_pls_bproc_component_open(void) { OBJ_CONSTRUCT(&mca_pls_bproc_component.lock, opal_mutex_t); OBJ_CONSTRUCT(&mca_pls_bproc_component.condition, opal_condition_t); /* init the list to hold the daemon names */ - rc = orte_pointer_array_init(&mca_pls_bproc_component.daemon_names, 8, 200000, -8); + rc = orte_pointer_array_init(&mca_pls_bproc_component.daemon_names, 8, 200000, 8); if(ORTE_SUCCESS != rc) { ORTE_ERROR_LOG(rc); } - - return ORTE_SUCCESS; + return rc; } int orte_pls_bproc_component_close(void) { diff --git a/orte/mca/pls/bproc_orted/Makefile.am b/orte/mca/pls/bproc_orted/Makefile.am index 523a2a841b..de059e591f 100644 --- a/orte/mca/pls/bproc_orted/Makefile.am +++ b/orte/mca/pls/bproc_orted/Makefile.am @@ -16,10 +16,32 @@ include $(top_ompi_srcdir)/config/Makefile.options -AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include +AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include $(pls_bproc_orted_CPPFLAGS) -noinst_LTLIBRARIES = libmca_pls_bproc_orted.la -libmca_pls_bproc_orted_la_SOURCES = \ +# Make the output library in this directory, and name it either +# mca__.la (for DSO builds) or libmca__.la +# (for static builds). + +if OMPI_BUILD_pls_bproc_orted_DSO +component_noinst = +component_install = mca_pls_bproc_orted.la +else +component_noinst = libmca_pls_bproc_orted.la +component_install = +endif + +sources = \ pls_bproc_orted.h \ pls_bproc_orted.c \ pls_bproc_orted_component.c + +mcacomponentdir = $(libdir)/openmpi +mcacomponent_LTLIBRARIES = $(component_install) +mca_pls_bproc_orted_la_SOURCES = $(sources) +mca_pls_bproc_orted_la_LIBADD = $(pls_bproc_orted_LIBS) +mca_pls_bproc_orted_la_LDFLAGS = -module -avoid-version $(pls_bproc_orted_LDFLAGS) + +noinst_LTLIBRARIES = $(component_noinst) +libmca_pls_bproc_orted_la_SOURCES = $(sources) +libmca_pls_bproc_orted_la_LIBADD = $(pls_bproc_orted_LIBS) +libmca_pls_bproc_orted_la_LDFLAGS = -module -avoid-version $(pls_bproc_orted_LDFLAGS) diff --git a/orte/mca/pls/bproc_orted/configure.m4 b/orte/mca/pls/bproc_orted/configure.m4 index 7bc5552109..bd5a00de42 100644 --- a/orte/mca/pls/bproc_orted/configure.m4 +++ b/orte/mca/pls/bproc_orted/configure.m4 @@ -30,7 +30,7 @@ AC_DEFUN([MCA_pls_bproc_orted_CONFIG],[ [$2]) # set build flags to use in makefile - AC_SUBST([pls_bproc_orted_OBJCFLAGS]) + AC_SUBST([pls_bproc_orted_CPPFLAGS]) AC_SUBST([pls_bproc_orted_LDFLAGS]) AC_SUBST([pls_bproc_orted_LIBS]) ])dnl diff --git a/orte/mca/pls/bproc_seed/configure.m4 b/orte/mca/pls/bproc_seed/configure.m4 index 35577eea31..c62aefdb18 100644 --- a/orte/mca/pls/bproc_seed/configure.m4 +++ b/orte/mca/pls/bproc_seed/configure.m4 @@ -33,7 +33,7 @@ AC_DEFUN([MCA_pls_bproc_seed_CONFIG],[ [AC_MSG_ERROR([Scyld bproc is not supported by the launching system yet])]) # set build flags to use in makefile - AC_SUBST([pls_bproc_seed_OBJCFLAGS]) + AC_SUBST([pls_bproc_seed_CPPFLAGS]) AC_SUBST([pls_bproc_seed_LDFLAGS]) AC_SUBST([pls_bproc_seed_LIBS]) ])dnl diff --git a/orte/mca/ras/bjs/configure.m4 b/orte/mca/ras/bjs/configure.m4 index 98b524f5b4..761bb368ae 100644 --- a/orte/mca/ras/bjs/configure.m4 +++ b/orte/mca/ras/bjs/configure.m4 @@ -30,7 +30,7 @@ AC_DEFUN([MCA_ras_bjs_CONFIG],[ [$2]) # set build flags to use in makefile - AC_SUBST([ras_bjs_OBJCFLAGS]) + AC_SUBST([ras_bjs_CPPFLAGS]) AC_SUBST([ras_bjs_LDFLAGS]) AC_SUBST([ras_bjs_LIBS]) ])dnl diff --git a/orte/mca/ras/lsf_bproc/configure.m4 b/orte/mca/ras/lsf_bproc/configure.m4 index 81b6d1c51d..9345498e9d 100644 --- a/orte/mca/ras/lsf_bproc/configure.m4 +++ b/orte/mca/ras/lsf_bproc/configure.m4 @@ -30,7 +30,7 @@ AC_DEFUN([MCA_ras_lsf_bproc_CONFIG],[ [$2]) # set build flags to use in makefile - AC_SUBST([ras_lsf_bproc_OBJCFLAGS]) + AC_SUBST([ras_lsf_bproc_CPPFLAGS]) AC_SUBST([ras_lsf_bproc_LDFLAGS]) AC_SUBST([ras_lsf_bproc_LIBS]) ])dnl diff --git a/orte/mca/soh/bproc/configure.m4 b/orte/mca/soh/bproc/configure.m4 index c8e2b054ce..3e8f0b41f4 100644 --- a/orte/mca/soh/bproc/configure.m4 +++ b/orte/mca/soh/bproc/configure.m4 @@ -30,7 +30,7 @@ AC_DEFUN([MCA_soh_bproc_CONFIG],[ [$2]) # set build flags to use in makefile - AC_SUBST([soh_bproc_OBJCFLAGS]) + AC_SUBST([soh_bproc_CPPFLAGS]) AC_SUBST([soh_bproc_LDFLAGS]) AC_SUBST([soh_bproc_LIBS]) ])dnl