From 69263505b7716d6672239cc52090d11c7c266889 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 26 Mar 2004 04:28:42 +0000 Subject: [PATCH] Bunches of changes to make "make dist" work properly This commit was SVN r966. --- configure.ac | 19 +------------------ src/Makefile.am | 4 +--- src/file/Makefile.am | 4 ++++ src/mca/common/Makefile.am | 2 ++ src/mca/io/romio/configure.params | 2 +- src/mca/io/romio/src/Makefile.am | 2 ++ .../io/romio/src/romio-1.2.5.1/Makefile.am | 8 ++++++++ .../src/romio-1.2.5.1/include/Makefile.am | 8 ++++++++ src/mca/ptl/base/Makefile.am | 1 + src/mca/ptl/tcp/src/Makefile.am | 1 + src/mem/Makefile.am | 1 + src/runtime/lam_finalize.c | 2 ++ src/runtime/lam_init.c | 2 ++ src/tools/mpirun/Makefile.am | 2 ++ src/tools/wrappers/Makefile.am | 8 ++++---- 15 files changed, 40 insertions(+), 26 deletions(-) create mode 100644 src/mca/io/romio/src/romio-1.2.5.1/Makefile.am create mode 100644 src/mca/io/romio/src/romio-1.2.5.1/include/Makefile.am diff --git a/configure.ac b/configure.ac index f311afb64b..9d08b05cef 100644 --- a/configure.ac +++ b/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 diff --git a/src/Makefile.am b/src/Makefile.am index 91680c1c4a..42ad1efb0c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 = \ diff --git a/src/file/Makefile.am b/src/file/Makefile.am index 2764916d6c..f4a95bacfb 100644 --- a/src/file/Makefile.am +++ b/src/file/Makefile.am @@ -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 = \ diff --git a/src/mca/common/Makefile.am b/src/mca/common/Makefile.am index 3c20797d57..8612ab32ff 100644 --- a/src/mca/common/Makefile.am +++ b/src/mca/common/Makefile.am @@ -5,3 +5,5 @@ include $(top_srcdir)/config/Makefile.options EXTRA_DIST = README + +SUBDIRS = base diff --git a/src/mca/io/romio/configure.params b/src/mca/io/romio/configure.params index 20af7fd52c..7ea9b43656 100644 --- a/src/mca/io/romio/configure.params +++ b/src/mca/io/romio/configure.params @@ -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" diff --git a/src/mca/io/romio/src/Makefile.am b/src/mca/io/romio/src/Makefile.am index 82fab67ce6..7a93f3d942 100644 --- a/src/mca/io/romio/src/Makefile.am +++ b/src/mca/io/romio/src/Makefile.am @@ -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 \ diff --git a/src/mca/io/romio/src/romio-1.2.5.1/Makefile.am b/src/mca/io/romio/src/romio-1.2.5.1/Makefile.am new file mode 100644 index 0000000000..acd4cf1fa3 --- /dev/null +++ b/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 diff --git a/src/mca/io/romio/src/romio-1.2.5.1/include/Makefile.am b/src/mca/io/romio/src/romio-1.2.5.1/include/Makefile.am new file mode 100644 index 0000000000..f96b95a760 --- /dev/null +++ b/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 diff --git a/src/mca/ptl/base/Makefile.am b/src/mca/ptl/base/Makefile.am index 103654953b..5bba9d7ed7 100644 --- a/src/mca/ptl/base/Makefile.am +++ b/src/mca/ptl/base/Makefile.am @@ -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 diff --git a/src/mca/ptl/tcp/src/Makefile.am b/src/mca/ptl/tcp/src/Makefile.am index b32cc5522f..40a471ab10 100644 --- a/src/mca/ptl/tcp/src/Makefile.am +++ b/src/mca/ptl/tcp/src/Makefile.am @@ -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 \ diff --git a/src/mem/Makefile.am b/src/mem/Makefile.am index d40629195b..4c067c5112 100644 --- a/src/mem/Makefile.am +++ b/src/mem/Makefile.am @@ -11,6 +11,7 @@ noinst_LTLIBRARIES = libmem.la headers = \ allocator.h \ + free_list.h \ free_lists.h \ malloc.h \ mem_globals.h \ diff --git a/src/runtime/lam_finalize.c b/src/runtime/lam_finalize.c index 15ca823f0a..7272cbf8aa 100644 --- a/src/runtime/lam_finalize.c +++ b/src/runtime/lam_finalize.c @@ -7,6 +7,8 @@ #include "include/constants.h" #include "runtime/runtime.h" #include "util/output.h" +#include "mem/malloc.h" + int lam_finalize(void) { diff --git a/src/runtime/lam_init.c b/src/runtime/lam_init.c index 05d0c8c655..3a5cc3e956 100644 --- a/src/runtime/lam_init.c +++ b/src/runtime/lam_init.c @@ -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. diff --git a/src/tools/mpirun/Makefile.am b/src/tools/mpirun/Makefile.am index cdbb22f00d..f4c5b4814e 100644 --- a/src/tools/mpirun/Makefile.am +++ b/src/tools/mpirun/Makefile.am @@ -7,3 +7,5 @@ include $(top_srcdir)/config/Makefile.options bin_SCRIPTS = mpirun mpiboot +EXTRA_DIST = $(bin_SCRIPTS) + diff --git a/src/tools/wrappers/Makefile.am b/src/tools/wrappers/Makefile.am index 78e8d51009..c2aa7cce85 100644 --- a/src/tools/wrappers/Makefile.am +++ b/src/tools/wrappers/Makefile.am @@ -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)