Speed up the build process by removing some redundant convenience

libraries This commit was SVN r1949.
2004-08-07 04:20:28 +00:00 · 2004-08-07 04:20:28 +00:00 · f870500088
--- a/config/mca_configure.ac
+++ b/config/mca_configure.ac
@ -19,27 +19,13 @@ AC_CONFIG_AUX_DIR(@PARAM_CONFIG_AUX_DIR@)
 if test -n "@PARAM_VERSION_FILE@" -a -f "@PARAM_VERSION_FILE@"; then
    OMPI_GET_VERSION(@PARAM_VERSION_FILE@, @PARAM_VAR_PREFIX@)

-    AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_MAJOR_VERSION, 
-        $@PARAM_VAR_PREFIX@_MAJOR_VERSION, 
-        [Major OMPI MCA @MCA_TYPE@ @MCA_COMPONENT_NAME@ version])
-    AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_MINOR_VERSION, 
-        $@PARAM_VAR_PREFIX@_MINOR_VERSION, 
-        [Minor OMPI MCA @MCA_TYPE@ @MCA_COMPONENT_NAME@ version])
-    AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_RELEASE_VERSION, 
-        $@PARAM_VAR_PREFIX@_RELEASE_VERSION, 
-        [Release OMPI MCA @MCA_TYPE@ @MCA_COMPONENT_NAME@ version])
-    AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_ALPHA_VERSION, 
-        $@PARAM_VAR_PREFIX@_ALPHA_VERSION, 
-        [Alpha OMPI MCA @MCA_TYPE@ @MCA_COMPONENT_NAME@ version])
-    AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_BETA_VERSION, 
-        $@PARAM_VAR_PREFIX@_BETA_VERSION, 
-        [Beta OMPI MCA @MCA_TYPE@ @MCA_COMPONENT_NAME@ version])
-    AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_CVS_VERSION, 
-        $@PARAM_VAR_PREFIX@_CVS_VERSION, 
-        [CVS OMPI MCA @MCA_TYPE@ @MCA_COMPONENT_NAME@ version])
-    AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_VERSION, 
-        "$@PARAM_VAR_PREFIX@_VERSION", 
-        [Overall OMPI MCA @MCA_TYPE@ @MCA_COMPONENT_NAME@ version number])
+    AC_SUBST(@PARAM_VAR_PREFIX@_MAJOR_VERSION)
+    AC_SUBST(@PARAM_VAR_PREFIX@_MINOR_VERSION)
+    AC_SUBST(@PARAM_VAR_PREFIX@_RELEASE_VERSION)
+    AC_SUBST(@PARAM_VAR_PREFIX@_ALPHA_VERSION)
+    AC_SUBST(@PARAM_VAR_PREFIX@_BETA_VERSION)
+    AC_SUBST(@PARAM_VAR_PREFIX@_SVN_VERSION)
+    AC_SUBST(@PARAM_VAR_PREFIX@_VERSION)
    version_string="version $@PARAM_VAR_PREFIX@_VERSION"
 else
    version_string=""
--- a/config/ompi_mca.m4
+++ b/config/ompi_mca.m4
@ -380,7 +380,7 @@ if test "$HAPPY" = "1"; then
 	$LN_S "$OMPI_TOP_BUILDDIR/src/mca/$type/$m" \
 	    "src/dynamic-mca/$type/$m"
    else
-	static_ltlibs="$m/libmca_${type}_${m}.la $static_ltlibs"
+	static_ltlibs="mca/$type/$m/libmca_${type}_${m}.la $static_ltlibs"
 	echo "extern const mca_base_component_t mca_${type}_${m}_component;" >> $outfile.extern
 	echo "  &mca_${type}_${m}_component, " >> $outfile.struct
 	compile_mode="static"
--- a/configure.ac
+++ b/configure.ac
@ -18,21 +18,6 @@ AC_CONFIG_AUX_DIR(./config)

 OMPI_GET_VERSION($srcdir/VERSION, OMPI)

-AC_DEFINE_UNQUOTED(OMPI_MAJOR_VERSION, $OMPI_MAJOR_VERSION, 
-    [Major OMPI version])
-AC_DEFINE_UNQUOTED(OMPI_MINOR_VERSION, $OMPI_MINOR_VERSION, 
-    [Minor OMPI version])
-AC_DEFINE_UNQUOTED(OMPI_RELEASE_VERSION, $OMPI_RELEASE_VERSION, 
-    [Release OMPI version])
-AC_DEFINE_UNQUOTED(OMPI_ALPHA_VERSION, $OMPI_ALPHA_VERSION, 
-    [Alpha OMPI version])
-AC_DEFINE_UNQUOTED(OMPI_BETA_VERSION, $OMPI_BETA_VERSION, 
-    [Beta OMPI version])
-AC_DEFINE_UNQUOTED(OMPI_SVN_VERSION, "$OMPI_SVN_VERSION", 
-    [SVN OMPI revision number])
-AC_DEFINE_UNQUOTED(OMPI_VERSION, "$OMPI_VERSION", 
-    [Overall OMPI version number])
-
 AC_SUBST(OMPI_MAJOR_VERSION)
 AC_SUBST(OMPI_MINOR_VERSION)
 AC_SUBST(OMPI_RELEASE_VERSION)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,10 +1,56 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #

 include $(top_srcdir)/config/Makefile.options

+# We always have C bindings, but do we have profiling?
+
+if WANT_MPI_BINDINGS_LAYER
+c_mpi_lib = mpi/c/libmpi_c_mpi.la
+else
+c_mpi_lib = 
+endif
+if WANT_PMPI_BINDINGS_LAYER
+c_pmpi_lib = mpi/c/profile/libmpi_c_pmpi.la
+else
+c_pmpi_lib = 
+endif
+
+# See if we have f77 MPI bindings
+
+if OMPI_WANT_F77_BINDINGS
+if WANT_MPI_F77_BINDINGS_LAYER
+f77_mpi_lib = mpi/f77/libmpi_f77_mpi.la
+else
+f77_mpi_lib = 
+endif
+if WANT_PMPI_F77_BINDINGS_LAYER
+f77_pmpi_lib = mpi/f77/profile/libmpi_f77_pmpi.la
+else
+f77_pmpi_lib = 
+endif
+else
+f77_mpi_lib =
+f77_pmpi_lib =
+endif
+
+# See if we have F90 MPI bindings
+
+if OMPI_WANT_F90_BINDINGS
+f90_lib =
+else
+f90_lib =
+endif
+
+# See if we have C++ MPI bindings
+
+if WANT_MPI_CXX_BINDINGS
+cxx_lib = 
+else
+cxx_lib =
+endif
+
 SUBDIRS = \
        include \
        $(LIBLTDL_SUBDIR) \
@ -37,15 +83,27 @@ libmpi_la_SOURCES =
 libmpi_la_LIBADD = \
        $(LIBLTDL_LTLIB) \
        attribute/libattribute.la \
+        class/liblfc.la \
        communicator/libcommunicator.la \
        datatype/libdatatype.la \
        errhandler/liberrhandler.la \
        event/libevent.la \
        group/libgroup.la \
        info/libinfo.la \
-        class/liblfc.la \
-        mca/libmca.la \
-        mpi/libmpi_bindings.la \
+        mca/base/libmca_base.la \
+        mca/allocator/base/libmca_allocator_base.la $(MCA_allocator_STATIC_LTLIBS) \
+        mca/coll/base/libmca_coll_base.la $(MCA_coll_STATIC_LTLIBS) \
+        $(MCA_common_STATIC_LTLIBS) \
+        mca/llm/base/libmca_llm_base.la $(MCA_llm_STATIC_LTLIBS) \
+        mca/mpool/base/libmca_mpool_base.la $(MCA_mpool_STATIC_LTLIBS) \
+        mca/ns/base/libmca_ns_base.la $(MCA_ns_STATIC_LTLIBS) \
+        mca/oob/base/libmca_oob_base.la $(MCA_oob_STATIC_LTLIBS) \
+        mca/pcm/base/libmca_pcm_base.la $(MCA_pcm_STATIC_LTLIBS) \
+        mca/pml/base/libmca_pml_base.la $(MCA_pml_STATIC_LTLIBS) \
+        mca/ptl/base/libmca_ptl_base.la $(MCA_ptl_STATIC_LTLIBS) \
+        mca/topo/base/libmca_topo_base.la $(MCA_topo_STATIC_LTLIBS) \
+        $(c_mpi_lib) $(c_pmpi_lib) $(f77_mpi_lib) $(f77_pmpi_lib) \
+        $(f90_lib) $(cxx_lib) \
 	mpiruntime/libmpiruntime.la \
        op/libop.la \
        proc/libproc.la \
--- a/src/mca/Makefile.am
+++ b/src/mca/Makefile.am
@ -27,30 +27,6 @@ DIST_SUBDIRS = $(SUBDIRS) gpr

 headers = mca.h

-# Library
-
-noinst_LTLIBRARIES = libmca.la
-
-libmca_la_SOURCES =
-libmca_la_LIBADD = \
-        allocator/libmca_allocator.la \
-        base/libmca_base.la \
-        coll/libmca_coll.la \
-	llm/libmca_llm.la \
-        mpool/libmca_mpool.la \
-        ns/libmca_ns.la \
-        oob/libmca_oob.la \
-        pcm/libmca_pcm.la \
-        pml/libmca_pml.la \
-        topo/libmca_topo.la \
-        ptl/libmca_ptl.la
-libmca_la_DEPENDENCIES = $(libmca_la_LIBADD)
-
-not_implemented_yet = \
-        one/libmca_one.la \
-        io/libmca_io.la \
-        common/libmca_common.la
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mca/allocator/Makefile.am
+++ b/src/mca/allocator/Makefile.am
@ -11,13 +11,6 @@ DIST_SUBDIRS = base $(MCA_allocator_ALL_SUBDIRS)

 headers = allocator.h

-noinst_LTLIBRARIES = libmca_allocator.la
-libmca_allocator_la_SOURCES =
-libmca_allocator_la_LIBADD = \
-        base/libmca_allocator_base.la \
-        $(MCA_allocator_STATIC_LTLIBS)
-libmca_allocator_la_DEPENDENCIES = $(libmca_allocator_la_LIBADD)
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mca/coll/Makefile.am
+++ b/src/mca/coll/Makefile.am
@ -11,13 +11,6 @@ DIST_SUBDIRS = base $(MCA_coll_ALL_SUBDIRS)

 headers = coll.h

-noinst_LTLIBRARIES = libmca_coll.la
-libmca_coll_la_SOURCES =
-libmca_coll_la_LIBADD = \
-        base/libmca_coll_base.la \
-        $(MCA_coll_STATIC_LTLIBS)
-libmca_coll_la_DEPENDENCIES = $(libmca_coll_la_LIBADD)
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mca/common/Makefile.am
+++ b/src/mca/common/Makefile.am
@ -6,9 +6,3 @@ include $(top_srcdir)/config/Makefile.options

 SUBDIRS = $(MCA_common_STATIC_SUBDIRS)
 DIST_SUBDIRS = $(MCA_common_ALL_SUBDIRS)
-
-noinst_LTLIBRARIES = libmca_common.la
-libmca_common_la_SOURCES = mca_common_dummy.c
-libmca_common_la_LIBADD = $(MCA_common_STATIC_LTLIBS)
-libmca_common_la_DEPENDENCIES = $(libmca_common_la_LIBADD)
-
--- a/src/mca/common/mca_common_dummy.c
+++ b/src/mca/common/mca_common_dummy.c
@ -1,11 +0,0 @@
-/*
- * $HEADER$
- */
-
-void mca_common_dummy_func(void);
-
-void
-mca_common_dummy_func(void)
-{
- /* BWB: here to keep automake happy until JMS fixes me. */
-}
--- a/src/mca/llm/Makefile.am
+++ b/src/mca/llm/Makefile.am
@ -7,20 +7,10 @@ include $(top_srcdir)/config/Makefile.options
 SUBDIRS = base $(MCA_llm_STATIC_SUBDIRS)
 DIST_SUBDIRS = base $(MCA_llm_ALL_SUBDIRS)

-noinst_LTLIBRARIES = libmca_llm.la
-
 # Source code files

 headers = llm.h

-# Library
-
-libmca_llm_la_SOURCES = $(headers)
-libmca_llm_la_LIBADD = \
-        $(MCA_llm_STATIC_LTLIBS) \
-        base/libmca_llm_base.la
-libmca_llm_la_DEPENDENCIES = $(libmca_llm_la_LIBADD)
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mca/mpool/Makefile.am
+++ b/src/mca/mpool/Makefile.am
@ -11,13 +11,6 @@ DIST_SUBDIRS = base $(MCA_mpool_ALL_SUBDIRS)

 headers = mpool.h

-noinst_LTLIBRARIES = libmca_mpool.la
-libmca_mpool_la_SOURCES =
-libmca_mpool_la_LIBADD = \
-        base/libmca_mpool_base.la \
-        $(MCA_mpool_STATIC_LTLIBS)
-libmca_mpool_la_DEPENDENCIES = $(libmca_mpool_la_LIBADD)
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mca/ns/Makefile.am
+++ b/src/mca/ns/Makefile.am
@ -11,13 +11,6 @@ DIST_SUBDIRS = base $(MCA_ns_ALL_SUBDIRS)

 headers = ns.h

-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
--- a/src/mca/oob/Makefile.am
+++ b/src/mca/oob/Makefile.am
@ -7,20 +7,11 @@ include $(top_srcdir)/config/Makefile.options
 SUBDIRS = base $(MCA_oob_STATIC_SUBDIRS)
 DIST_SUBDIRS = base $(MCA_oob_ALL_SUBDIRS)

-noinst_LTLIBRARIES = libmca_oob.la

 # Source code files

 headers = oob.h

-# Library
-
-libmca_oob_la_SOURCES = $(headers)
-libmca_oob_la_LIBADD = \
-        $(MCA_oob_STATIC_LTLIBS) \
-        base/libmca_oob_base.la
-libmca_oob_la_DEPENDENCIES = $(libmca_oob_la_LIBADD)
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mca/pcm/Makefile.am
+++ b/src/mca/pcm/Makefile.am
@ -7,20 +7,10 @@ include $(top_srcdir)/config/Makefile.options
 SUBDIRS = base $(MCA_pcm_STATIC_SUBDIRS)
 DIST_SUBDIRS = base $(MCA_pcm_ALL_SUBDIRS)

-noinst_LTLIBRARIES = libmca_pcm.la
-
 # Source code files

 headers = pcm.h

-# Library
-
-libmca_pcm_la_SOURCES = $(headers)
-libmca_pcm_la_LIBADD = \
-        $(MCA_pcm_STATIC_LTLIBS) \
-        base/libmca_pcm_base.la
-libmca_pcm_la_DEPENDENCIES = $(libmca_pcm_la_LIBADD)
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mca/pml/Makefile.am
+++ b/src/mca/pml/Makefile.am
@ -11,13 +11,6 @@ DIST_SUBDIRS = base $(MCA_pml_ALL_SUBDIRS)

 headers = pml.h

-noinst_LTLIBRARIES = libmca_pml.la
-libmca_pml_la_SOURCES =
-libmca_pml_la_LIBADD = \
-        base/libmca_pml_base.la \
-        $(MCA_pml_STATIC_LTLIBS)
-libmca_pml_la_DEPENDENCIES = $(libmca_pml_la_LIBADD)
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mca/ptl/Makefile.am
+++ b/src/mca/ptl/Makefile.am
@ -11,13 +11,6 @@ DIST_SUBDIRS = base $(MCA_ptl_ALL_SUBDIRS)

 headers = ptl.h

-noinst_LTLIBRARIES = libmca_ptl.la
-libmca_ptl_la_SOURCES =
-libmca_ptl_la_LIBADD = \
-        base/libmca_ptl_base.la \
-        $(MCA_ptl_STATIC_LTLIBS)
-libmca_ptl_la_DEPENDENCIES = $(libmca_ptl_la_LIBADD)
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mca/topo/Makefile.am
+++ b/src/mca/topo/Makefile.am
@ -11,13 +11,6 @@ DIST_SUBDIRS = base $(MCA_topo_ALL_SUBDIRS)

 headers = topo.h

-noinst_LTLIBRARIES = libmca_topo.la
-libmca_topo_la_SOURCES =
-libmca_topo_la_LIBADD = \
-	base/libmca_topo_base.la \
-	$(MCA_topo_STATIC_LTLIBS)
-	libmca_topo_la_DEPENDENCIES = $(libmca_topo_la_LIBADD)
-
 # Conditionally install the header files

 if WANT_INSTALL_HEADERS
--- a/src/mpi/Makefile.am
+++ b/src/mpi/Makefile.am
@ -1,35 +1,7 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #

 include $(top_srcdir)/config/Makefile.options

-noinst_LTLIBRARIES = libmpi_bindings.la
-
-# See if configure found a valid f77 compiler
-
-if OMPI_WANT_F77_BINDINGS
-f77_lib = f77/libmpi_f77.la
-else
-f77_lib =
-endif
-
-# See if configure found a valid f90/f95 compiler
-
-if OMPI_WANT_F90_BINDINGS
-f90_lib =
-else
-f90_lib =
-endif
-
-if WANT_MPI_CXX_BINDINGS
-cxx_lib = 
-else
-cxx_lib =
-endif
-
 SUBDIRS = c cxx f77 f90
-
-libmpi_bindings_la_SOURCES =
-libmpi_bindings_la_LIBADD = c/libmpi_c.la $(f77_lib) $(f90_lib) $(cxx_lib)
--- a/src/mpi/c/Makefile.am
+++ b/src/mpi/c/Makefile.am
@ -1,4 +1,3 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #
@ -52,11 +51,6 @@ headers = bindings.h
 libmpi_c_la_SOURCES = \
        attr_fn.c

-
-libmpi_c_la_LIBADD  = \
-                    $(mpi_lib) \
-                    $(pmpi_lib)
-
 libmpi_c_mpi_la_SOURCES = \
        abort.c \
        accumulate.c \
--- a/src/mpi/f77/Makefile.am
+++ b/src/mpi/f77/Makefile.am
@ -1,4 +1,3 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #
@ -59,10 +58,6 @@ headers = \
 libmpi_f77_la_SOURCES   = \
 		attr_fn_f.c

-libmpi_f77_la_LIBADD    = \
-                    $(mpi_lib) \
-                    $(pmpi_lib)
-
 libmpi_f77_mpi_la_SOURCES = \
        abort_f.c \
        accumulate_f.c \
--- a/src/tools/ompi_info/Makefile.am
+++ b/src/tools/ompi_info/Makefile.am
@ -21,7 +21,14 @@ AM_CPPFLAGS = \
            -DOMPI_BUILD_FFLAGS="\"@FFLAGS@\"" \
            -DOMPI_BUILD_FCFLAGS="\"@FCFLAGS@\"" \
            -DOMPI_BUILD_LDFLAGS="\"@LDFLAGS@\"" \
-            -DOMPI_BUILD_LIBS="\"@LIBS@\""
+            -DOMPI_BUILD_LIBS="\"@LIBS@\"" \
+            -DOMPI_MAJOR_VERSION=@OMPI_MAJOR_VERSION@ \
+            -DOMPI_MINOR_VERSION=@OMPI_MINOR_VERSION@ \
+            -DOMPI_RELEASE_VERSION=@OMPI_RELEASE_VERSION@ \
+            -DOMPI_ALPHA_VERSION=@OMPI_ALPHA_VERSION@ \
+            -DOMPI_BETA_VERSION=@OMPI_BETA_VERSION@ \
+            -DOMPI_SVN_VERSION=\"@OMPI_SVN_VERSION@\" \
+            -DOMPI_VERSION=\"@OMPI_VERSION\"

 libs = $(top_builddir)/src/libmpi.la