From 9ee904d95de93ef94ec3d1c9318880339f1e545f Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 7 Jul 2004 20:59:20 +0000 Subject: [PATCH] Bunches of things to make "make dist" work This commit was SVN r1577. --- configure.ac | 15 +++++++++++++-- src/dynamic-mca/Makefile.am | 2 +- src/dynamic-mca/ns/Makefile.am | 14 ++++++++++++++ src/errhandler/Makefile.am | 3 +++ src/include/Makefile.am | 2 ++ src/include/sys/Makefile.am | 7 +++++++ src/include/sys/alpha/Makefile.am | 16 ++++++++++++++++ src/include/sys/amd64/Makefile.am | 16 ++++++++++++++++ src/include/sys/ia32/Makefile.am | 16 ++++++++++++++++ src/include/sys/ia64/Makefile.am | 16 ++++++++++++++++ src/include/sys/powerpc/Makefile.am | 16 ++++++++++++++++ src/include/sys/sparc64/Makefile.am | 16 ++++++++++++++++ src/mca/Makefile.am | 2 +- src/mca/gpr/Makefile.am | 23 ++++++++++++++++++++++- src/mca/gpr/base/Makefile.am | 29 +++++++++++++++++++++++++++++ src/mca/ns/Makefile.am | 18 ++++++++++-------- src/mca/ns/base/Makefile.am | 3 +-- 17 files changed, 199 insertions(+), 15 deletions(-) create mode 100644 src/dynamic-mca/ns/Makefile.am create mode 100644 src/include/sys/Makefile.am create mode 100644 src/include/sys/alpha/Makefile.am create mode 100644 src/include/sys/amd64/Makefile.am create mode 100644 src/include/sys/ia32/Makefile.am create mode 100644 src/include/sys/ia64/Makefile.am create mode 100644 src/include/sys/powerpc/Makefile.am create mode 100644 src/include/sys/sparc64/Makefile.am create mode 100644 src/mca/gpr/base/Makefile.am diff --git a/configure.ac b/configure.ac index f91c1470b4..855ceb4538 100644 --- a/configure.ac +++ b/configure.ac @@ -790,6 +790,13 @@ AC_CONFIG_FILES([ src/Makefile src/include/Makefile + src/include/sys/Makefile + src/include/sys/alpha/Makefile + src/include/sys/amd64/Makefile + src/include/sys/ia32/Makefile + src/include/sys/ia64/Makefile + src/include/sys/powerpc/Makefile + src/include/sys/sparc64/Makefile src/ctnetwork/Makefile src/class/Makefile @@ -840,19 +847,22 @@ AC_CONFIG_FILES([ src/mca/allocator/base/Makefile src/mca/coll/Makefile src/mca/coll/base/Makefile + src/mca/gpr/Makefile + src/mca/gpr/base/Makefile src/mca/io/Makefile src/mca/io/base/Makefile src/mca/mpool/Makefile src/mca/mpool/base/Makefile src/mca/one/Makefile src/mca/one/base/Makefile + src/mca/ns/Makefile + src/mca/ns/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/mca/gpr/Makefile src/dynamic-mca/common/Makefile @@ -862,13 +872,14 @@ AC_CONFIG_FILES([ src/dynamic-mca/Makefile src/dynamic-mca/allocator/Makefile src/dynamic-mca/coll/Makefile + src/dynamic-mca/gpr/Makefile src/dynamic-mca/io/Makefile src/dynamic-mca/mpool/Makefile src/dynamic-mca/one/Makefile + src/dynamic-mca/ns/Makefile src/dynamic-mca/pml/Makefile src/dynamic-mca/ptl/Makefile src/dynamic-mca/topo/Makefile - src/dynamic-mca/gpr/Makefile src/mpi/Makefile src/mpi/c/Makefile diff --git a/src/dynamic-mca/Makefile.am b/src/dynamic-mca/Makefile.am index dcef6a5e73..38378c4b6b 100644 --- a/src/dynamic-mca/Makefile.am +++ b/src/dynamic-mca/Makefile.am @@ -18,4 +18,4 @@ SUBDIRS = \ topo # JMS Temporary hack to make "make dist" function properly; directories # mentioned here will eventually be moved into SUBDIRS -DIST_SUBDIRS = $(SUBDIRS) gpr +DIST_SUBDIRS = $(SUBDIRS) gpr ns diff --git a/src/dynamic-mca/ns/Makefile.am b/src/dynamic-mca/ns/Makefile.am new file mode 100644 index 0000000000..30fc7bf4f5 --- /dev/null +++ b/src/dynamic-mca/ns/Makefile.am @@ -0,0 +1,14 @@ +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +SUBDIRS = $(MCA_ns_DSO_SUBDIRS) +DISTCLEANFILES = $(SUBDIRS) + +# Every directory under here is a sym link to something in the main +# share/ssi tree. Hence, we don't want to distribute anything under +# here. + +DIST_SUBDIRS = diff --git a/src/errhandler/Makefile.am b/src/errhandler/Makefile.am index ba491adad4..d883861c5f 100644 --- a/src/errhandler/Makefile.am +++ b/src/errhandler/Makefile.am @@ -10,6 +10,9 @@ noinst_LTLIBRARIES = liberrhandler.la # Source code files headers = \ + errclass.h \ + errcode.h \ + errcode-internal.h \ errhandler.h \ errhandler_predefined.h diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 7e8773526d..2b63b19d84 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -4,6 +4,8 @@ include $(top_srcdir)/config/Makefile.options +SUBDIRS = sys + headers = \ atomic.h \ constants.h \ diff --git a/src/include/sys/Makefile.am b/src/include/sys/Makefile.am new file mode 100644 index 0000000000..e122c265c1 --- /dev/null +++ b/src/include/sys/Makefile.am @@ -0,0 +1,7 @@ +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +SUBDIRS = alpha amd64 ia32 ia64 powerpc sparc64 diff --git a/src/include/sys/alpha/Makefile.am b/src/include/sys/alpha/Makefile.am new file mode 100644 index 0000000000..21afe2b2da --- /dev/null +++ b/src/include/sys/alpha/Makefile.am @@ -0,0 +1,16 @@ +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +headers = atomic.h + +# Conditionally install the header files + +if WANT_INSTALL_HEADERS +ompidir = $(includedir)/openmpi/include/sys/alpha +ompi_HEADERS = $(headers) +else +ompidir = $(includedir) +endif diff --git a/src/include/sys/amd64/Makefile.am b/src/include/sys/amd64/Makefile.am new file mode 100644 index 0000000000..8eece66467 --- /dev/null +++ b/src/include/sys/amd64/Makefile.am @@ -0,0 +1,16 @@ +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +headers = atomic.h + +# Conditionally install the header files + +if WANT_INSTALL_HEADERS +ompidir = $(includedir)/openmpi/include/sys/amd64 +ompi_HEADERS = $(headers) +else +ompidir = $(includedir) +endif diff --git a/src/include/sys/ia32/Makefile.am b/src/include/sys/ia32/Makefile.am new file mode 100644 index 0000000000..507d040b13 --- /dev/null +++ b/src/include/sys/ia32/Makefile.am @@ -0,0 +1,16 @@ +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +headers = atomic.h + +# Conditionally install the header files + +if WANT_INSTALL_HEADERS +ompidir = $(includedir)/openmpi/include/sys/ia32 +ompi_HEADERS = $(headers) +else +ompidir = $(includedir) +endif diff --git a/src/include/sys/ia64/Makefile.am b/src/include/sys/ia64/Makefile.am new file mode 100644 index 0000000000..b74bbc7b73 --- /dev/null +++ b/src/include/sys/ia64/Makefile.am @@ -0,0 +1,16 @@ +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +headers = atomic.h + +# Conditionally install the header files + +if WANT_INSTALL_HEADERS +ompidir = $(includedir)/openmpi/include/sys/ia64 +ompi_HEADERS = $(headers) +else +ompidir = $(includedir) +endif diff --git a/src/include/sys/powerpc/Makefile.am b/src/include/sys/powerpc/Makefile.am new file mode 100644 index 0000000000..ae63d04628 --- /dev/null +++ b/src/include/sys/powerpc/Makefile.am @@ -0,0 +1,16 @@ +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +headers = atomic.h + +# Conditionally install the header files + +if WANT_INSTALL_HEADERS +ompidir = $(includedir)/openmpi/include/sys/powerpc +ompi_HEADERS = $(headers) +else +ompidir = $(includedir) +endif diff --git a/src/include/sys/sparc64/Makefile.am b/src/include/sys/sparc64/Makefile.am new file mode 100644 index 0000000000..9768cba290 --- /dev/null +++ b/src/include/sys/sparc64/Makefile.am @@ -0,0 +1,16 @@ +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +headers = atomic.h + +# Conditionally install the header files + +if WANT_INSTALL_HEADERS +ompidir = $(includedir)/openmpi/include/sys/sparc64 +ompi_HEADERS = $(headers) +else +ompidir = $(includedir) +endif diff --git a/src/mca/Makefile.am b/src/mca/Makefile.am index bc43a79f07..59b174d071 100644 --- a/src/mca/Makefile.am +++ b/src/mca/Makefile.am @@ -19,7 +19,7 @@ SUBDIRS = \ topo # JMS Temporary hack to make "make dist" function properly; directories # mentioned here will eventually be moved into SUBDIRS -DIST_SUBDIRS = $(SUBDIRS) gpr +DIST_SUBDIRS = $(SUBDIRS) gpr ns # Source code files diff --git a/src/mca/gpr/Makefile.am b/src/mca/gpr/Makefile.am index 343ec0a9c7..5c0686b1e2 100644 --- a/src/mca/gpr/Makefile.am +++ b/src/mca/gpr/Makefile.am @@ -1,7 +1,28 @@ -# -*- makefile -*- # # $HEADER$ # include $(top_srcdir)/config/Makefile.options +SUBDIRS = base $(MCA_gpr_STATIC_SUBDIRS) +DIST_SUBDIRS = base $(MCA_gpr_ALL_SUBDIRS) + +# Source code files + +headers = gpr.h + +noinst_LTLIBRARIES = libmca_gpr.la +libmca_gpr_la_SOURCES = +libmca_gpr_la_LIBADD = \ + base/libmca_gpr_base.la \ + $(MCA_gpr_STATIC_LTLIBS) +libmca_gpr_la_DEPENDENCIES = $(libmca_gpr_la_LIBADD) + +# Conditionally install the header files + +if WANT_INSTALL_HEADERS +ompidir = $(includedir)/openmpi/mca/gpr +ompi_HEADERS = $(headers) +else +ompidir = $(includedir) +endif diff --git a/src/mca/gpr/base/Makefile.am b/src/mca/gpr/base/Makefile.am new file mode 100644 index 0000000000..5fed0adfe1 --- /dev/null +++ b/src/mca/gpr/base/Makefile.am @@ -0,0 +1,29 @@ +# +# $HEADER$ +# + +include $(top_srcdir)/config/Makefile.options + +noinst_LTLIBRARIES = libmca_gpr_base.la + +# For VPATH builds, have to specify where static-modules.h will be found + +AM_CPPFLAGS = -I$(top_builddir)/src + +# Source code files + +headers = \ + base.h + +libmca_gpr_base_la_SOURCES = \ + $(headers) + +# Conditionally install the header files + +if WANT_INSTALL_HEADERS +ompidir = $(includedir)/openmpi/mca/gpr/base +ompi_HEADERS = $(headers) +else +ompidir = $(includedir) +endif + diff --git a/src/mca/ns/Makefile.am b/src/mca/ns/Makefile.am index acc9299faa..9bac544986 100644 --- a/src/mca/ns/Makefile.am +++ b/src/mca/ns/Makefile.am @@ -1,25 +1,27 @@ -# -*- makefile -*- # # $HEADER$ # include $(top_srcdir)/config/Makefile.options -noinst_LTLIBRARIES = libns.la +SUBDIRS = base $(MCA_ns_STATIC_SUBDIRS) +DIST_SUBDIRS = base $(MCA_ns_ALL_SUBDIRS) # Source code files -headers = \ - ns.h +headers = ns.h -libns_la_SOURCES = \ - $(headers) \ - replica/name_server.c +noinst_LTLIBRARIES = libmca_ns.la +libmca_ns_la_SOURCES = +libmca_ns_la_LIBADD = \ + base/libmca_ns_base.la \ + $(MCA_ns_STATIC_LTLIBS) +libmca_ns_la_DEPENDENCIES = $(libmca_ns_la_LIBADD) # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(includedir)/ompi/util +ompidir = $(includedir)/openmpi/mca/ns ompi_HEADERS = $(headers) else ompidir = $(includedir) diff --git a/src/mca/ns/base/Makefile.am b/src/mca/ns/base/Makefile.am index c49408511f..5931a60ef7 100644 --- a/src/mca/ns/base/Makefile.am +++ b/src/mca/ns/base/Makefile.am @@ -15,8 +15,6 @@ AM_CPPFLAGS = -I$(top_builddir)/src headers = \ base.h -# Library - libmca_ns_base_la_SOURCES = \ $(headers) \ ns_base_close.c \ @@ -31,3 +29,4 @@ ompi_HEADERS = $(headers) else ompidir = $(includedir) endif +