1
1

Corrected Makefile.am files for pls and soh xcpu-components as per Brian's suggestion.

This commit was SVN r9519.
Этот коммит содержится в:
Sushant Sharma 2006-04-03 17:14:47 +00:00
родитель e7051c427b
Коммит 8d5289b2b8
3 изменённых файлов: 9 добавлений и 24 удалений

Просмотреть файл

@ -24,7 +24,7 @@ AC_DEFUN([OMPI_CHECK_XCPU],[
[AC_HELP_STRING([--with-xcpu],
[Path to xcpu installation])])
AS_IF([test ! -z "$with_xcpu" -a "$with_xcpu" = "no"],[$4], [
AS_IF([test "$with_xcpu" = "no"],[$3], [
ompi_check_xcpu_save_CPPFLAGS="$CPPFLAGS"
ompi_check_xcpu_save_LDFLAGS="$LDFLAGS"
ompi_check_xcpu_save_LIBS="$LIBS"
@ -49,15 +49,14 @@ AC_DEFUN([OMPI_CHECK_XCPU],[
LDFLAGS="$ompi_check_xcpu_save_LDFLAGS"
LIBS="$ompi_check_xcpu_save_LIBS"
AS_IF([test "$ompi_check_xcpu_works" != "no"],
AS_IF([test "$ompi_check_xcpu_works" = "yes"],
[AS_IF([test ! -z "$with_xcpu" -a "$with_xcpu" != "yes"],
[$1_CPPFLAGS="$$1_CPPFLAGS -I$with_xcpu/include"
$1_LDFLAGS="$$1_LDFLAGS -L$with_xcpu/lib"])
$1_LIBS="$$1_LIBS -lxcpu"
AS_IF([test "$ompi_check_xcpu_works" = "yes"], [$2], [$3])],
$2],
[AS_IF([test ! -z "$with_xcpu"],
[AC_MSG_ERROR([xcpu support requested but not found. Perhaps
you need to specify the location of the xcpu libraries.])])
$4])
[AC_MSG_ERROR([xcpu support requested but not found. Perhaps you need to specify the location of the xcpu libraries.])])
$3])
])
])

Просмотреть файл

@ -18,7 +18,7 @@
#dist_pkgdata_DATA = help-pls-bproc.txt
AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include $(pls_xcpu_CPPFLAGS) -DORTE_BINDIR="\"$(bindir)\""
AM_CPPFLAGS = $(pls_xcpu_CPPFLAGS)
# Make the output library in this directory, and name it either
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la

Просмотреть файл

@ -16,11 +16,6 @@
# $HEADER$
#
headers = \
soh_xcpu.h
if OMPI_BUILD_soh_xcpu_DSO
component_noinst =
component_install = mca_soh_xcpu.la
@ -29,29 +24,20 @@ component_noinst = libmca_soh_xcpu.la
component_install =
endif
# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(includedir)/openmpi/orte/mca/soh/xcpu
orte_HEADERS = $(headers)
else
ortedir = $(includedir)
endif
host_SOURCES = \
xcpu_SOURCES = \
soh_xcpu.c \
soh_xcpu.h \
soh_xcpu_component.c
mcacomponentdir = $(libdir)/openmpi
mcacomponent_LTLIBRARIES = $(component_install)
mca_soh_xcpu_la_SOURCES = $(host_SOURCES)
mca_soh_xcpu_la_SOURCES = $(xcpu_SOURCES)
mca_soh_xcpu_la_LIBADD = \
$(top_ompi_builddir)/orte/liborte.la \
$(top_ompi_builddir)/opal/libopal.la
mca_soh_xcpu_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(component_noinst)
libmca_soh_xcpu_la_SOURCES = $(host_SOURCES)
libmca_soh_xcpu_la_SOURCES = $(xcpu_SOURCES)
libmca_soh_xcpu_la_LIBADD =
libmca_soh_xcpu_la_LDFLAGS = -module -avoid-version