Bunches of changes to make "make dist" work properly
This commit was SVN r966.
Этот коммит содержится в:
Jeff Squyres
родитель
46d0f47357
Коммит
69263505b7
19
configure.ac
19
configure.ac
@ -755,6 +755,7 @@ AC_CONFIG_FILES([
|
||||
src/communicator/Makefile
|
||||
src/datatype/Makefile
|
||||
src/errhandler/Makefile
|
||||
src/file/Makefile
|
||||
src/group/Makefile
|
||||
src/info/Makefile
|
||||
src/op/Makefile
|
||||
@ -784,8 +785,6 @@ AC_CONFIG_FILES([
|
||||
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
|
||||
@ -799,21 +798,5 @@ AC_CONFIG_FILES([
|
||||
src/tools/laminfo/Makefile
|
||||
src/tools/mpirun/Makefile
|
||||
src/tools/wrappers/Makefile
|
||||
|
||||
test/Makefile
|
||||
test/support/Makefile
|
||||
test/lam/Makefile
|
||||
test/lam/lfc/Makefile
|
||||
test/lam/threads/Makefile
|
||||
test/lam/util/Makefile
|
||||
test/mpi/Makefile
|
||||
test/mpi/environment/Makefile
|
||||
test/unit/Makefile
|
||||
test/unit/lam/Makefile
|
||||
test/unit/lam/oob_cofs/Makefile
|
||||
test/unit/lam/util/Makefile
|
||||
test/unit/mpi/Makefile
|
||||
test/unit/mpi/communicator/Makefile
|
||||
test/unit/mpi/datatype/Makefile
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
@ -14,6 +14,7 @@ SUBDIRS = \
|
||||
datatype \
|
||||
errhandler \
|
||||
event \
|
||||
file \
|
||||
group \
|
||||
info \
|
||||
lfc \
|
||||
@ -31,9 +32,6 @@ SUBDIRS = \
|
||||
. \
|
||||
tools
|
||||
|
||||
not_yet = \
|
||||
file
|
||||
|
||||
lib_LTLIBRARIES = libmpi.la
|
||||
libmpi_la_SOURCES =
|
||||
libmpi_la_LIBADD = \
|
||||
|
||||
@ -5,6 +5,10 @@
|
||||
|
||||
include $(top_srcdir)/config/Makefile.options
|
||||
|
||||
# JMS Remove this when we actually start building a library in here
|
||||
# and $(headers) gets included in a SOURCES somewhere
|
||||
EXTRA_DIST = $(headers)
|
||||
|
||||
# Source code files
|
||||
|
||||
headers = \
|
||||
|
||||
@ -5,3 +5,5 @@
|
||||
include $(top_srcdir)/config/Makefile.options
|
||||
|
||||
EXTRA_DIST = README
|
||||
|
||||
SUBDIRS = base
|
||||
|
||||
@ -7,4 +7,4 @@
|
||||
|
||||
PARAM_INIT_FILE=src/io_romio_module.c
|
||||
PARAM_CONFIG_HEADER_FILE="src/romio_config.h"
|
||||
PARAM_CONFIG_FILES="Makefile src/Makefile"
|
||||
PARAM_CONFIG_FILES="Makefile src/Makefile src/romio-1.2.5.1/Makefile src/romio-1.2.5.1/include/Makefile"
|
||||
|
||||
@ -5,6 +5,8 @@
|
||||
|
||||
include $(top_lam_srcdir)/config/Makefile.options
|
||||
|
||||
SUBDIRS = romio-1.2.5.1
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_lam_builddir)/src/include \
|
||||
-I$(top_lam_srcdir)/src \
|
||||
|
||||
8
src/mca/io/romio/src/romio-1.2.5.1/Makefile.am
Обычный файл
8
src/mca/io/romio/src/romio-1.2.5.1/Makefile.am
Обычный файл
@ -0,0 +1,8 @@
|
||||
# -*- makefile -*-
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
include $(top_lam_srcdir)/config/Makefile.options
|
||||
|
||||
SUBDIRS = include
|
||||
8
src/mca/io/romio/src/romio-1.2.5.1/include/Makefile.am
Обычный файл
8
src/mca/io/romio/src/romio-1.2.5.1/include/Makefile.am
Обычный файл
@ -0,0 +1,8 @@
|
||||
# -*- makefile -*-
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
include $(top_lam_srcdir)/config/Makefile.options
|
||||
|
||||
noinst_HEADERS = mpio.h
|
||||
@ -19,6 +19,7 @@ headers = \
|
||||
ptl_base_header.h \
|
||||
ptl_base_match.h \
|
||||
ptl_base_recvfrag.h \
|
||||
ptl_base_recvreq.h \
|
||||
ptl_base_sendfrag.h \
|
||||
ptl_base_sendreq.h
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@ noinst_LTLIBRARIES = libmca_ptl_tcp.la
|
||||
libmca_ptl_tcp_la_SOURCES = \
|
||||
ptl_tcp.c \
|
||||
ptl_tcp.h \
|
||||
ptl_tcp_addr.h \
|
||||
ptl_tcp_peer.c \
|
||||
ptl_tcp_peer.h \
|
||||
ptl_tcp_proc.c \
|
||||
|
||||
@ -11,6 +11,7 @@ noinst_LTLIBRARIES = libmem.la
|
||||
|
||||
headers = \
|
||||
allocator.h \
|
||||
free_list.h \
|
||||
free_lists.h \
|
||||
malloc.h \
|
||||
mem_globals.h \
|
||||
|
||||
@ -7,6 +7,8 @@
|
||||
#include "include/constants.h"
|
||||
#include "runtime/runtime.h"
|
||||
#include "util/output.h"
|
||||
#include "mem/malloc.h"
|
||||
|
||||
|
||||
int lam_finalize(void)
|
||||
{
|
||||
|
||||
@ -11,6 +11,8 @@
|
||||
#include "util/output.h"
|
||||
#include "threads/mutex.h"
|
||||
#include "event/event.h"
|
||||
#include "mem/malloc.h"
|
||||
|
||||
|
||||
/**
|
||||
* First function that must be called in a LAM process.
|
||||
|
||||
@ -7,3 +7,5 @@ include $(top_srcdir)/config/Makefile.options
|
||||
|
||||
bin_SCRIPTS = mpirun mpiboot
|
||||
|
||||
EXTRA_DIST = $(bin_SCRIPTS)
|
||||
|
||||
|
||||
@ -29,22 +29,22 @@ bin_PROGRAMS = mpicc mpic++ mpif77 mpif90
|
||||
|
||||
EXTRA_DIST = wrap.cc wrap_engine.cc
|
||||
|
||||
mpicc_SOURCES = mpicc.cc wrap_cc.cc wrap_engine_cc.cc
|
||||
mpicc_SOURCES = mpicc.cc wrap_cc.cc wrap_engine_cc.cc lamwrap.h
|
||||
mpicc_LDADD = $(libs) $(LIBLAM_EXTRA_LIBS)
|
||||
mpicc_LDFLAGS = $(LIBLAM_EXTRA_LDFLAGS)
|
||||
mpicc_DEPENDENCIES = $(libs)
|
||||
|
||||
mpic___SOURCES = mpicxx.cc wrap_cxx.cc wrap_engine_cxx.cc
|
||||
mpic___SOURCES = mpicxx.cc wrap_cxx.cc wrap_engine_cxx.cc lamwrap.h
|
||||
mpic___LDADD = $(libs) $(LIBLAM_EXTRA_LIBS)
|
||||
mpic___LDFLAGS = $(LIBLAM_EXTRA_LDFLAGS)
|
||||
mpic___DEPENDENCIES = $(libs)
|
||||
|
||||
mpif77_SOURCES = mpif77.cc wrap_f77.cc wrap_engine_f77.cc
|
||||
mpif77_SOURCES = mpif77.cc wrap_f77.cc wrap_engine_f77.cc lamwrap.h
|
||||
mpif77_LDADD = $(libs) $(LIBLAM_EXTRA_LIBS)
|
||||
mpif77_LDFLAGS = $(LIBLAM_EXTRA_LDFLAGS)
|
||||
mpif77_DEPENDENCIES = $(libs)
|
||||
|
||||
mpif90_SOURCES = mpif90.cc wrap_f90.cc wrap_engine_f90.cc
|
||||
mpif90_SOURCES = mpif90.cc wrap_f90.cc wrap_engine_f90.cc lamwrap.h
|
||||
mpif90_LDADD = $(libs) $(LIBLAM_EXTRA_LIBS)
|
||||
mpif90_LDFLAGS = $(LIBLAM_EXTRA_LDFLAGS)
|
||||
mpif90_DEPENDENCIES = $(libs)
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user