1
1

Build system mods for the new directory organization

This commit was SVN r879.
Этот коммит содержится в:
Jeff Squyres 2004-03-17 19:06:06 +00:00
родитель b9892161ef
Коммит aa8ef8bd0a
57 изменённых файлов: 248 добавлений и 274 удалений

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

@ -336,20 +336,16 @@ EOF
# configure, not any of the MCA modules.
if test -f src/include/mpi.h; then
rm -rf libltdl src/mca/libltdl src/mca/ltdl.h
rm -rf libltdl src/libltdl src/ltdl.h
run_and_check $lam_libtoolize --automake --copy --ltdl
mv libltdl src/mca
mv libltdl src
echo "Adjusting libltdl for LAM :-("
echo " -- adding sym link for src/mca/ltdl.h"
cd src/mca
ln -s libltdl/ltdl.h ltdl.h
cd ../..
echo " -- patching for argz bugfix in libtool 1.5"
cd src/mca/libltdl
patch -N -p0 <<EOF
cd src/libltdl
if test "`grep 'while ((before >= *pargz) && (before[-1] != LT_EOS_CHAR))' ltdl.c`" != ""; then
patch -N -p0 <<EOF
--- ltdl.c.old 2003-11-26 16:42:17.000000000 -0500
+++ ltdl.c 2003-12-03 17:06:27.000000000 -0500
@@ -682,7 +682,7 @@
@ -362,7 +358,10 @@ EOF
{
EOF
cd ../../..
else
echo " ==> your libtool doesn't need this! yay!"
fi
cd ../..
echo " -- patching configure for broken -c/-o compiler test"
sed -e 's/chmod -w \./#LAM\/MPI FIX: chmod -w ./' \
configure > configure.new
@ -466,7 +465,7 @@ EOF
pd_module_name="`basename $pd_dir`"
pd_module_type="`dirname $pd_dir`"
pd_module_type="`basename $pd_module_type`"
pd_get_ver="../../../../../config/lam_get_version.sh"
pd_get_ver="../../../../config/lam_get_version.sh"
pd_ver_file="`grep PARAM_VERSION_FILE configure.params`"
if test -z "$pd_ver_file"; then
pd_ver_file="VERSION"
@ -592,12 +591,12 @@ run_global() {
touch "$mca_no_configure_modules_file" "$mca_no_config_list_file" \
"$mca_no_config_amc_file"
# Now run the config in every directory in src/mca/[lam|mpi]/*/*
# Now run the config in every directory in src/mca/*/*
# that has a configure.in or configure.ac script
rg_cwd="`pwd`"
echo $rg_cwd
for type in src/mca/lam/* src/mca/mpi/*; do
for type in src/mca/*; do
if test -d "$type"; then
for module in "$type"/*; do
if test -d "$module"; then
@ -707,7 +706,7 @@ elif test -f configure.in -o -f configure.ac -o -f configure.params ; then
# Top level of a module directory
want_local=yes
if test -z "$lamdir"; then
lamdir="../../../../.."
lamdir="../../../.."
fi
else
cat <<EOF

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

@ -43,7 +43,7 @@ unset msg
# The list of MCA types (it's fixed)
AC_MSG_CHECKING([for MCA types])
found_types="lam/oob lam/pcm lam/registry mpi/coll mpi/io mpi/one mpi/pml mpi/ptl mpi/topo"
found_types="oob pcm registry coll io one pml ptl topo"
AC_MSG_RESULT([$found_types])
# Get the list of all the non-configure MCA modules that were found by
@ -64,16 +64,11 @@ for type in $found_types; do
dynamic_modules=
static_ltlibs=
# Separate into subtypes
library="`echo $type | cut -d/ -f1`"
type="`echo $type | cut -d/ -f2`"
# Ensure that the directory where the #include file is to live
# exists. Need to do this for VPATH builds, because the directory
# may not exist yet.
outdir=src/mca/$library/$type/base
outdir=src/mca/$type/base
total_dir="."
for dir_part in `IFS='/\\'; set X $outdir; shift; echo "$[@]"`; do
total_dir=$total_dir/$dir_part
@ -85,7 +80,7 @@ for type in $found_types; do
# Also ensure that the dynamic-mca base directory exists
total_dir="."
dyndir=src/mca/dynamic-$library/$type
dyndir=src/mca/dynamic/$type
for dir_part in `IFS='/\\'; set X $dyndir; shift; echo "$[@]"`; do
total_dir=$total_dir/$dir_part
test -d "$total_dir" ||
@ -130,11 +125,11 @@ for type in $found_types; do
# Remove any possible sym link in the mca-dynamic tree
rm -f src/mca/dyanmic-$library/$type/$m
rm -f src/mca/dyanmic/$type/$m
# Now process the module
MCA_PROCESS_MODULE(1, 1, $library, $type, $m)
MCA_PROCESS_MODULE(1, 1, $type, $m)
# Note that the AM_CONDITIONAL for this module is set in
# config/mca_module_list.m4 -- which is generated by
@ -157,7 +152,7 @@ for type in $found_types; do
# Find all configureable modules, run their configure scripts,
# etc.
for module in $srcdir/src/mca/$library/$type/*; do
for module in $srcdir/src/mca/$type/*; do
FOUND=0
HAPPY=0
m="`basename $module`"
@ -171,18 +166,18 @@ for type in $found_types; do
# Remove any possible sym link in the mca-dynamic tree
rm -f src/mca/dyanmic-$library/$type/$m
rm -f src/mca/dyanmic/$type/$m
# Configure the module subdirectory
LAM_CONFIG_SUBDIR([src/mca/$library/$type/$m],
LAM_CONFIG_SUBDIR([src/mca/$type/$m],
[$lam_subdir_args],
[HAPPY=1], [HAPPY=0])
fi
# Process this module
MCA_PROCESS_MODULE($FOUND, $HAPPY, $library, $type, $m)
MCA_PROCESS_MODULE($FOUND, $HAPPY, $type, $m)
done
# m4 weirdness: must also do the echo after the sort, or we get a
@ -296,14 +291,13 @@ dnl -----------------------------------------------------------------------
AC_DEFUN([MCA_PROCESS_MODULE],[
HAPPY=$1
FOUND=$2
library=$3
type=$4
m=$5
type=$3
m=$4
# See if it dropped an output file for us to pick up some
# shell variables in.
infile="src/mca/$library/$type/$m/post_configure.sh"
infile="src/mca/$type/$m/post_configure.sh"
# Did we find a valid module, and did its configure run
# successfully?
@ -334,10 +328,10 @@ if test "$HAPPY" = "1"; then
"$LOADABLE_MODULE_all" = "1"; then
compile_mode="dynamic"
echo $m >> $outfile.dynamic
ls -l "src/mca/dynamic-$library/$type/$m"
$LN_S "$LAM_TOP_BUILDDIR/src/mca/$library/$type/$m" \
"src/mca/dynamic-$library/$type/$m"
ls -l "src/mca/dynamic-$library/$type/$m"
ls -l "src/mca/dynamic/$type/$m"
$LN_S "$LAM_TOP_BUILDDIR/src/mca/$type/$m" \
"src/mca/dynamic/$type/$m"
ls -l "src/mca/dynamic/$type/$m"
else
static_ltlibs="$m/libmca_${library}_${type}_${m}.la $static_ltlibs"
echo "extern const mca_base_module_t mca_${type}_${m}_module;" >> $outfile.extern

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

@ -10,7 +10,7 @@
# Init autoconf
AC_INIT(./src/mpi/interface/c/init.c)
AC_INIT(./src/mpi/c/init.c)
AC_PREREQ(2.58)
AC_CONFIG_AUX_DIR(./config)
@ -525,7 +525,7 @@ liblam_third_party_subdirs=
lam_show_subtitle "Libevent 3rd party event handler"
CFLAGS_save="$CFLAGS"
CFLAGS="$LAM_CFLAGS_BEFORE_PICKY"
LAM_CONFIG_SUBDIR(src/lam/event, [$lam_subdir_args], [HAPPY=1], [HAPPY=0])
LAM_CONFIG_SUBDIR(src/event, [$lam_subdir_args], [HAPPY=1], [HAPPY=0])
if test "$HAPPY" = "0"; then
AC_MSG_WARN([*** libevent failed to configure properly])
AC_MSG_ERROR([*** Cannot continue])
@ -548,7 +548,7 @@ lam_show_subtitle "Libtool configuration"
# 1.5) because it has support for a lot more things than older
# versions of libtool (which are generally installed by default).
AC_LIBLTDL_CONVENIENCE(src/mca/libltdl)
AC_LIBLTDL_CONVENIENCE(src/libltdl)
AC_SUBST(LTDLINCL)
AC_SUBST(LIBLTDL)
AC_LIBTOOL_DLOPEN
@ -587,7 +587,7 @@ fi
CFLAGS_save="$CFLAGS"
CFLAGS="$LAM_CFLAGS_BEFORE_PICKY"
LAM_CONFIG_SUBDIR(src/mca/libltdl, [$lam_subdir_args], [HAPPY=1], [HAPPY=0])
LAM_CONFIG_SUBDIR(src/libltdl, [$lam_subdir_args], [HAPPY=1], [HAPPY=0])
if test "$HAPPY" = "1"; then
LIBLTDL_SUBDIR=libltdl
LIBLTDL_LTLIB=libltdl/libltdlc.la
@ -596,8 +596,8 @@ if test "$HAPPY" = "1"; then
# Arrgh. This is gross. But I can't think of any other way to do
# it. :-(
flags="`egrep ^LIBADD_DL src/mca/libltdl/Makefile | cut -d= -f2-`"
LAM_CHECK_LINKER_FLAGS([src/mca/libltdl/libtool], [-export-dynamic $flags])
flags="`egrep ^LIBADD_DL src/libltdl/Makefile | cut -d= -f2-`"
LAM_CHECK_LINKER_FLAGS([src/libltdl/libtool], [-export-dynamic $flags])
WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS $extra_ldflags"
LDFLAGS="-export-dynamic $LDFLAGS"
else
@ -708,78 +708,69 @@ AC_CONFIG_FILES([
src/Makefile
src/include/Makefile
src/lam/Makefile
src/lam/ctnetwork/Makefile
src/lam/lfc/Makefile
src/lam/mem/Makefile
src/ctnetwork/Makefile
src/lfc/Makefile
src/mem/Makefile
src/os/Makefile
src/os/cygwin/Makefile
src/os/darwin/Makefile
src/os/darwin/ppc_32/Makefile
src/os/darwin/ppc_64/Makefile
src/os/irix/Makefile
src/os/irix/sn0/Makefile
src/os/linux/Makefile
src/os/linux/alpha/Makefile
src/os/linux/i686/Makefile
src/os/linux/ia64/Makefile
src/os/linux/x86_64/Makefile
src/os/tru64/Makefile
src/runtime/Makefile
src/threads/Makefile
src/util/Makefile
src/lam/os/Makefile
src/lam/os/cygwin/Makefile
src/lam/os/darwin/Makefile
src/lam/os/darwin/ppc_32/Makefile
src/lam/os/darwin/ppc_64/Makefile
src/lam/os/irix/Makefile
src/lam/os/irix/sn0/Makefile
src/lam/os/linux/Makefile
src/lam/os/linux/alpha/Makefile
src/lam/os/linux/i686/Makefile
src/lam/os/linux/ia64/Makefile
src/lam/os/linux/x86_64/Makefile
src/lam/os/tru64/Makefile
src/lam/runtime/Makefile
src/lam/threads/Makefile
src/lam/util/Makefile
src/mpi/Makefile
src/mpi/attribute/Makefile
src/mpi/communicator/Makefile
src/mpi/datatype/Makefile
src/mpi/errhandler/Makefile
src/mpi/group/Makefile
src/mpi/info/Makefile
src/mpi/interface/Makefile
src/mpi/interface/c/Makefile
src/mpi/interface/c/profile/Makefile
src/mpi/interface/cxx/Makefile
src/mpi/interface/f77/Makefile
src/mpi/interface/f77/profile/Makefile
src/mpi/interface/f90/Makefile
src/mpi/op/Makefile
src/mpi/proc/Makefile
src/mpi/request/Makefile
src/mpi/runtime/Makefile
src/mpi/win/Makefile
src/attribute/Makefile
src/communicator/Makefile
src/datatype/Makefile
src/errhandler/Makefile
src/group/Makefile
src/info/Makefile
src/op/Makefile
src/proc/Makefile
src/request/Makefile
src/win/Makefile
src/mca/Makefile
src/mca/base/Makefile
src/mca/common/Makefile
src/mca/common/base/Makefile
src/mca/lam/Makefile
src/mca/lam/base/Makefile
src/mca/lam/common_lam/Makefile
src/mca/lam/common_lam/base/Makefile
src/mca/lam/oob/Makefile
src/mca/lam/oob/base/Makefile
src/mca/lam/pcm/Makefile
src/mca/lam/pcm/base/Makefile
src/mca/lam/registry/Makefile
src/mca/lam/registry/base/Makefile
src/mca/oob/Makefile
src/mca/oob/base/Makefile
src/mca/pcm/Makefile
src/mca/pcm/base/Makefile
src/mca/registry/Makefile
src/mca/registry/base/Makefile
src/mca/mpi/Makefile
src/mca/mpi/base/Makefile
src/mca/mpi/coll/Makefile
src/mca/mpi/coll/base/Makefile
src/mca/mpi/common_mpi/Makefile
src/mca/mpi/common_mpi/base/Makefile
src/mca/mpi/io/Makefile
src/mca/mpi/io/base/Makefile
src/mca/mpi/one/Makefile
src/mca/mpi/one/base/Makefile
src/mca/mpi/pml/Makefile
src/mca/mpi/pml/base/Makefile
src/mca/mpi/ptl/Makefile
src/mca/mpi/ptl/base/Makefile
src/mca/mpi/topo/Makefile
src/mca/mpi/topo/base/Makefile
src/mca/coll/Makefile
src/mca/coll/base/Makefile
src/mca/io/Makefile
src/mca/io/base/Makefile
src/mca/one/Makefile
src/mca/one/base/Makefile
src/mca/pml/Makefile
src/mca/pml/base/Makefile
src/mca/ptl/Makefile
src/mca/ptl/base/Makefile
src/mca/topo/Makefile
src/mca/topo/base/Makefile
src/mpi/Makefile
src/mpi/c/Makefile
src/mpi/c/profile/Makefile
src/mpi/cxx/Makefile
src/mpi/f77/Makefile
src/mpi/f77/profile/Makefile
src/mpi/f90/Makefile
src/tools/Makefile
src/tools/laminfo/Makefile

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

@ -5,39 +5,54 @@
include $(top_srcdir)/config/Makefile.options
SUBDIRS = include lam mpi mca . tools
# If the --enable-single-library flag was given to configure, then the
# user wants to merge liblam and libmpi into a single big, honkin'
# libmpi. So the libmpi in this directory should be a convenience
# (noinst) library. Otherwise, it should be installed into lib.
lam_sources = lam/liblam_convenience.la mca/libmca_lam.la
mpi_sources = mpi/libmpi_convenience.la mca/libmca_mpi.la
if WANT_SINGLE_MPI_LIBRARY
install_libs = libmpi.la
libmpi_sources = $(mpi_sources) $(lam_sources)
liblam_sources =
else
install_libs = libmpi.la liblam.la
libmpi_sources = $(mpi_sources)
liblam_sources = $(lam_sources)
endif
lib_LTLIBRARIES = $(install_libs)
SUBDIRS = \
include \
$(LIBLTDL_SUBDIR) \
attribute \
communicator \
ctnetwork \
datatype \
errhandler \
event \
file \
group \
info \
lfc \
mca \
mem \
mpi \
op \
os \
proc \
request \
runtime \
threads \
util \
win \
tools
lib_LTLIBRARIES = libmpi.la
libmpi_la_SOURCES =
libmpi_la_LIBADD = $(libmpi_sources)
liblam_la_SOURCES =
liblam_la_LIBADD = $(liblam_sources)
# Shortcut frequently used by developers -- NOT to be used by
# end-users!!
libs:
cd lam && $(MAKE) all && cd ../mpi && $(MAKE) all && cd .. && $(MAKE) $(install_libs)
libs-install: libs
$(MAKE) install-exec-am
libmpi_la_LIBADD = \
$(LIBLTDL_LTLIB) \
attribute/libattribute.la \
communicator/libcommunicator.la \
ctnetwork/libctnetwork.la \
datatype/libdatatype.la \
errhandler/liberrhandler.la \
event/libevent.la \
file/libfile.la \
group/libgroup.la \
info/libinfo.la \
lfc/liblfc.la \
mca/libmca.la \
mem/libmem.la \
mpi/libmpi_bindings.la \
op/libop.la \
os/libos.la \
proc/libproc.la \
request/librequest.la \
runtime/libruntime.la \
threads/libthreads.la \
util/libutil.la \
win/libwin.la

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

@ -5,21 +5,21 @@
include $(top_srcdir)/config/Makefile.options
#libraries
noinst_LTLIBRARIES = libmpi_attribute.la
noinst_LTLIBRARIES = libattribute.la
# Source code files
headers = \
attribute.h
libmpi_attribute_la_SOURCES = \
libattribute_la_SOURCES = \
$(headers) \
attribute.c
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/attribute
lamdir = $(includedir)/lam/attribute
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,21 +5,21 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmpi_communicator.la
noinst_LTLIBRARIES = libcommunicator.la
# Source code files
headers = \
communicator.h
libmpi_communicator_la_SOURCES = \
libcommunicator_la_SOURCES = \
$(headers) \
lam_comm_init.c
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/communicator
lamdir = $(includedir)/lam/communicator
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -33,7 +33,7 @@ bogus = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/ctnetwork
lamdir = $(includedir)/lam/ctnetwork
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,14 +5,14 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmpi_datatype.la
noinst_LTLIBRARIES = libdatatype.la
# Source code files
headers = \
datatype.h
libmpi_datatype_la_SOURCES = \
libdatatype_la_SOURCES = \
$(headers) \
datatype.c \
datatype_copy.c \
@ -26,7 +26,7 @@ libmpi_datatype_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/datatype
lamdir = $(includedir)/lam/datatype
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -13,7 +13,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/communicator
lamdir = $(includedir)/lam/communicator
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,8 +5,8 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
# of the header files in this directory get included elsewhere in LAM.
# #@%@#$...
AM_CPPFLAGS = \
-I$(top_builddir)/../../include -I$(top_srcdir)/../../include \
-I$(top_builddir)/../..
-I$(top_builddir)/../include -I$(top_srcdir)/../include \
-I$(top_builddir)/..
CFLAGS = -Wall @CFLAGS@
# LAM: No need to build the sample or test
@ -44,9 +44,6 @@ libevent_la_DEPENDENCIES = $(lt_libobj)
include_HEADERS = event.h
# LAM: Make it work in a VPATH environment
INCLUDES = -I$(top_srcdir)/compat -I$(top_srcdir)/../.. -I$(top_srcdir)/../../include
man_MANS = event.3
DISTCLEANFILES = *~

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

@ -13,7 +13,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/file
lamdir = $(includedir)/lam/file
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,14 +5,14 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmpi_group.la
noinst_LTLIBRARIES = libgroup.la
# Source code files
headers = \
group.h
libmpi_group_la_SOURCES = \
libgroup_la_SOURCES = \
$(headers) \
mpi_group_init.c \
mpi_set_group_rank.c
@ -20,7 +20,7 @@ libmpi_group_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/group
lamdir = $(includedir)/lam/group
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,21 +5,21 @@
include $(top_srcdir)/config/Makefile.options
# libraries
noinst_LTLIBRARIES = libmpi_info.la
noinst_LTLIBRARIES = libinfo.la
# Source code files
headers = \
info.h
libmpi_info_la_SOURCES = \
libinfo_la_SOURCES = \
$(headers) \
info.c
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/info
lamdir = $(includedir)/lam/info
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -29,7 +29,7 @@ liblfc_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/lfc
lamdir = $(includedir)/lam/lfc
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -6,9 +6,8 @@ include $(top_srcdir)/config/Makefile.options
SUBDIRS = \
base \
common_lam \
common_mpi \
coll \
common \
io \
one \
oob \
@ -39,8 +38,7 @@ libmca_la_LIBADD = $(LIBLTDL_LTLIB) \
ptl/libmca_ptl.la \
registry/libmca_registry.la \
topo/libmca_topo.la
libmca_la_DEPENDENCIES = $(libmca_lam_la_LIBADD)
libmca_la_DEPENDENCIES = $(libmca_la_LIBADD)
# Conditionally install the header files

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

@ -6,7 +6,7 @@ include $(top_srcdir)/config/Makefile.options
AM_CPPFLAGS = -DLAM_PKGLIBDIR=\"$(pkglibdir)\"
noinst_LTLIBRARIES = libmca_lam_base.la
noinst_LTLIBRARIES = libmca_base.la
# Source code files
@ -17,7 +17,7 @@ headers = \
# Library
libmca_lam_base_la_SOURCES = \
libmca_base_la_SOURCES = \
$(headers) \
mca_base_close.c \
mca_base_cmd_line.c \
@ -34,7 +34,7 @@ libmca_lam_base_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/lam/base
lamdir = $(includedir)/lam/mca/base
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -7,25 +7,21 @@ include $(top_srcdir)/config/Makefile.options
SUBDIRS = base $(MCA_coll_STATIC_SUBDIRS)
DIST_SUBDIRS = base $(MCA_coll_ALL_SUBDIRS)
# For VPATH builds, have to specify where static-modules.h will be found
AM_CPPFLAGS = -I$(top_builddir)/src
# Source code files
headers = coll.h
noinst_LTLIBRARIES = libmca_mpi_coll.la
libmca_mpi_coll_la_SOURCES =
libmca_mpi_coll_la_LIBADD = \
base/libmca_mpi_coll_base.la \
noinst_LTLIBRARIES = libmca_coll.la
libmca_coll_la_SOURCES =
libmca_coll_la_LIBADD = \
base/libmca_coll_base.la \
$(MCA_coll_STATIC_LTLIBS)
libmca_mpi_coll_la_DEPENDENCIES = $(libmca_mpi_coll_la_LIBADD)
libmca_coll_la_DEPENDENCIES = $(libmca_coll_la_LIBADD)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/coll
lamdir = $(includedir)/lam/mca/coll
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -4,17 +4,13 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmca_mpi_coll_base.la
# For VPATH builds, have to specify where static-modules.h will be found
AM_CPPFLAGS = -I$(top_builddir)/src
noinst_LTLIBRARIES = libmca_coll_base.la
headers = \
base.h \
coll_tags.h
libmca_mpi_coll_base_la_SOURCES = \
libmca_coll_base_la_SOURCES = \
coll_base_close.c \
coll_base_open.c \
coll_base_select.c
@ -22,7 +18,7 @@ libmca_mpi_coll_base_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/coll/base
lamdir = $(includedir)/lam/mca/coll/base
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -14,7 +14,7 @@ headers = io.h
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/io
lamdir = $(includedir)/lam/mca/io
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -14,7 +14,7 @@ headers = one.h
# Conditonenally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/one
lamdir = $(includedir)/lam/mca/one
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -24,7 +24,7 @@ libmca_oob_la_DEPENDENCIES = $(libmca_oob_la_LIBADD)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/lam/oob
lamdir = $(includedir)/lam/mca/oob
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -26,7 +26,7 @@ libmca_oob_base_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/lam/oob/base
lamdir = $(includedir)/lam/mca/oob/base
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -24,7 +24,7 @@ libmca_pcm_la_DEPENDENCIES = $(libmca_pcm_la_LIBADD)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/lam/pcm
lamdir = $(includedir)/lam/mca/pcm
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -26,7 +26,7 @@ libmca_pcm_base_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/lam/pcm/base
lamdir = $(includedir)/lam/mca/pcm/base
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -11,17 +11,17 @@ DIST_SUBDIRS = base $(MCA_pml_ALL_SUBDIRS)
headers = pml.h
noinst_LTLIBRARIES = libmca_mpi_pml.la
libmca_mpi_pml_la_SOURCES =
libmca_mpi_pml_la_LIBADD = \
base/libmca_mpi_pml_base.la \
noinst_LTLIBRARIES = libmca_pml.la
libmca_pml_la_SOURCES =
libmca_pml_la_LIBADD = \
base/libmca_pml_base.la \
$(MCA_pml_STATIC_LTLIBS)
libmca_mpi_pml_la_DEPENDENCIES = $(libmca_mpi_pml_la_LIBADD)
libmca_pml_la_DEPENDENCIES = $(libmca_pml_la_LIBADD)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/pml
lamdir = $(includedir)/lam/mca/pml
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmca_mpi_pml_base.la
noinst_LTLIBRARIES = libmca_pml_base.la
# For VPATH builds, have to specify where static-modules.h will be found
@ -16,7 +16,7 @@ headers = \
base.h \
pml_base_request.h
libmca_mpi_pml_base_la_SOURCES = \
libmca_pml_base_la_SOURCES = \
$(headers) \
pml_base_close.c \
pml_base_request.c \
@ -26,7 +26,7 @@ libmca_mpi_pml_base_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/pml/base
lamdir = $(includedir)/lam/mca/pml/base
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -11,17 +11,17 @@ DIST_SUBDIRS = base $(MCA_ptl_ALL_SUBDIRS)
headers = ptl.h
noinst_LTLIBRARIES = libmca_mpi_ptl.la
libmca_mpi_ptl_la_SOURCES =
libmca_mpi_ptl_la_LIBADD = \
base/libmca_mpi_ptl_base.la \
noinst_LTLIBRARIES = libmca_ptl.la
libmca_ptl_la_SOURCES =
libmca_ptl_la_LIBADD = \
base/libmca_ptl_base.la \
$(MCA_ptl_STATIC_LTLIBS)
libmca_mpi_ptl_la_DEPENDENCIES = $(libmca_mpi_ptl_la_LIBADD)
libmca_ptl_la_DEPENDENCIES = $(libmca_ptl_la_LIBADD)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/ptl
lamdir = $(includedir)/lam/mca/ptl
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmca_mpi_ptl_base.la
noinst_LTLIBRARIES = libmca_ptl_base.la
# For VPATH builds, have to specify where static-modules.h will be found
@ -22,7 +22,7 @@ headers = \
ptl_base_sendfrag.h \
ptl_base_sendreq.h
libmca_mpi_ptl_base_la_SOURCES = \
libmca_ptl_base_la_SOURCES = \
$(headers) \
ptl_base_close.c \
ptl_base_comm.c \
@ -38,7 +38,7 @@ libmca_mpi_ptl_base_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/mca/mpi/ptl/base
lamdir = $(includedir)/mca/ptl/base
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -24,7 +24,7 @@ libmca_registry_la_DEPENDENCIES = $(libmca_registry_la_LIBADD)
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/lam/registry
lamdir = $(includedir)/lam/mca/registry
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -26,7 +26,7 @@ libmca_registry_base_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/lam/registry/base
lamdir = $(includedir)/lam/mca/registry/base
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -14,7 +14,7 @@ headers = topo.h
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/topo
lamdir = $(includedir)/lam/mca/topo
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -4,16 +4,12 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmca_mpi_topo_base.la
# For VPATH builds, have to specify where static-modules.h will be found
AM_CPPFLAGS = -I$(top_builddir)/src
noinst_LTLIBRARIES = libmca_topo_base.la
headers = \
base.h
libmca_mpi_topo_base_la_SOURCES = \
libmca_topo_base_la_SOURCES = \
$(headers) \
topo_base_cart_coords.c \
topo_base_cart_create.c \
@ -34,9 +30,9 @@ libmca_mpi_topo_base_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/topo/base
lam_HEADERS = $(headers)
lamdir = $(includedir)/lam/mca/topo/base
lam_HEADERS = $(headers)
else
lamdir = $(includedir)
lamdir = $(includedir)
endif

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

@ -15,11 +15,3 @@ libmca_topo_unity_la_SOURCES = \
topo_unity_module.c \
cart_map.c \
graph_map.c
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mca/mpi/topo/unity/src/
lam_HEADERS = $(headers)
else
lamdir = $(includedir)
endif

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

@ -32,7 +32,7 @@ libmem_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/mem
lamdir = $(includedir)/lam/mem
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,6 +5,10 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmpi_bindings.la
SUBDIRS = c cxx f77 f90
# See if configure found a valid f77 compiler
if BUILD_MPI_F77
@ -21,9 +25,5 @@ else
f90_lib =
endif
SUBDIRS = c cxx f77 f90
noinst_LTLIBRARIES = libmpi_interface.la
libmpi_interface_la_SOURCES =
libmpi_interface_la_LIBADD = c/libmpi_c.la $(f77_lib) $(f90_lib)
libmpi_bindings_la_SOURCES =
libmpi_bindings_la_LIBADD = c/libmpi_c.la $(f77_lib) $(f90_lib)

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

@ -341,7 +341,7 @@ nodist_libmpi_c_pmpi_la_SOURCES = \
$(nodist_libmpi_c_pmpi_la_SOURCES):
if test ! -r $@ ; then \
pname=`echo $@ | cut -b '2-'` ; \
ln -s $(top_srcdir)/src/mpi/interface/c/$$pname $@ ; \
ln -s $(top_srcdir)/src/mpi/c/$$pname $@ ; \
fi
# Conditionally install the header files

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

@ -39,7 +39,7 @@ nodist_libmpi_f77_pmpi_la_SOURCES = \
$(nodist_libmpi_f77_pmpi_la_SOURCES):
if test ! -r $@ ; then \
pname=`echo $@ | cut -b '2-'` ; \
ln -s $(top_srcdir)/src/mpi/interface/f77/$$pname $@ ; \
ln -s $(top_srcdir)/src/mpi/f77/$$pname $@ ; \
fi
#
#

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

@ -13,7 +13,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/op
lamdir = $(includedir)/lam/op
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -15,7 +15,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os
lamdir = $(includedir)/lam/os
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -13,7 +13,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/cygwin
lamdir = $(includedir)/lam/os/cygwin
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -12,7 +12,7 @@ headers = ulm_os.h
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/darwin
lamdir = $(includedir)/lam/os/darwin
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -11,7 +11,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/darwin/ppc_32
lamdir = $(includedir)/lam/os/darwin/ppc_32
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -12,7 +12,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/darwin/ppc_64
lamdir = $(includedir)/lam/os/darwin/ppc_64
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,7 +5,7 @@
include $(top_srcdir)/config/Makefile.options
SUBDIRS = sn0
SUBDIRS = sn0
headers = \
atomic.h \
@ -15,7 +15,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/irix
lamdir = $(includedir)/lam/os/irix
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -12,7 +12,7 @@ headers = ulm_os.h
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/linux
lamdir = $(includedir)/lam/os/linux
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -12,7 +12,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/linux/alpha
lamdir = $(includedir)/lam/os/linux/alpha
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -13,7 +13,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/linux/i686
lamdir = $(includedir)/lam/os/linux/i686
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -13,7 +13,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/linux/ia64
lamdir = $(includedir)/lam/os/linux/ia64
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -12,7 +12,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/linux/x86_64
lamdir = $(includedir)/lam/os/linux/x86_64
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -13,7 +13,7 @@ headers = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/os/tru64
lamdir = $(includedir)/lam/os/tru64
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,21 +5,21 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmpi_proc.la
noinst_LTLIBRARIES = libproc.la
# Source code files
headers = \
proc.h
libmpi_proc_la_SOURCES = \
libproc_la_SOURCES = \
$(headers) \
proc.c
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/proc
lamdir = $(includedir)/lam/proc
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,21 +5,21 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmpi_request.la
noinst_LTLIBRARIES = librequest.la
# Source code files
headers = \
request.h
libmpi_request_la_SOURCES = \
librequest_la_SOURCES = \
$(headers) \
request.c
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/request
lamdir = $(includedir)/lam/request
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,7 +5,7 @@
include $(top_srcdir)/config/Makefile.options
AM_CPPFLAGS = -I$(top_builddir)/src/lam/event
AM_CPPFLAGS = -I$(top_builddir)/src/event
noinst_LTLIBRARIES = libruntime.la
@ -25,7 +25,7 @@ libruntime_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/runtime
lamdir = $(includedir)/lam/runtime
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -34,7 +34,7 @@ libthreads_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/threads
lamdir = $(includedir)/lam/threads
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -27,7 +27,7 @@ laminfo_SOURCES = \
param.cc \
version.cc
laminfo_LDADD = $(libs) $(LIBMPI_EXTRA_LIBS) $(LIBLAM_EXTRA_LIBS)
laminfo_LDFLAGS = $(LIBMPI_EXTRA_LDFLAGS) $(LIBLAM_EXTRA_LDFLAGS) -lpthread
laminfo_LDFLAGS = $(LIBMPI_EXTRA_LDFLAGS) $(LIBLAM_EXTRA_LDFLAGS)
laminfo_DEPENDENCIES = $(libs)
clean-local:

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

@ -33,7 +33,7 @@ libutil_la_SOURCES = \
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/lam/util
lamdir = $(includedir)/lam/util
lam_HEADERS = $(headers)
else
lamdir = $(includedir)

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

@ -5,21 +5,21 @@
include $(top_srcdir)/config/Makefile.options
noinst_LTLIBRARIES = libmpi_win.la
noinst_LTLIBRARIES = libwin.la
# Source code files
headers = \
win.h
libmpi_win_la_SOURCES = \
libwin_la_SOURCES = \
$(headers) \
win.c
# Conditionally install the header files
if WANT_INSTALL_HEADERS
lamdir = $(includedir)/lam/mpi/win
lamdir = $(includedir)/lam/win
lam_HEADERS = $(headers)
else
lamdir = $(includedir)