From ed56e743b7f48606e7d2f1d0cf61b377769de0bd Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Wed, 7 Sep 2005 05:54:53 +0000 Subject: [PATCH] * update configure.ac to use the modern version of AC_INIT and AM_INIT_AUTOMAKE, instead of the deprecated version. * Work around dumbness in modern AC_INIT that requires the version number to be set at autoconf time (instead of at configure time, as it was before). Set the version number, minus the subversion r number, at autoconf time. Override the internal variables to include the r number (if needed) at configure time. Basically, the right thing should always happen. The only place it might not is the version reported as part of configure --help will not have an r number. * Since AM_INIT_AUTOMAKE taks a list of options, no need to specify them in all the Makefile.am files. * Addes support for subdir-objects, meaning that object files are put in the directory containing source files, even if the Makefile.am is in another directory. This should start making it feasible to reduce the number of Makefile.am files we have in the tree, which will greatly reduce the time to run autogen and configure. This commit was SVN r7211. --- Makefile.am | 2 +- config/Makefile.am | 2 +- config/distscript.csh | 2 + config/ompi_get_libtool_linker_flags.m4 | 6 +- config/ompi_get_version.sh | 6 ++ config/ompi_setup_cc.m4 | 80 ++++++++++--------- configure.ac | 37 ++++++--- contrib/Makefile.am | 2 +- doc/Makefile.am | 2 +- doc/user/Makefile.am | 2 +- etc/Makefile.am | 2 +- include/Makefile.am | 2 +- ompi/Makefile.am | 2 +- ompi/attribute/Makefile.am | 2 +- ompi/class/Makefile.am | 2 +- ompi/communicator/Makefile.am | 2 +- ompi/datatype/Makefile.am | 2 +- ompi/dynamic-mca/Makefile.am | 2 +- ompi/dynamic-mca/allocator/Makefile.am | 2 +- ompi/dynamic-mca/bml/Makefile.am | 2 +- ompi/dynamic-mca/btl/Makefile.am | 2 +- ompi/dynamic-mca/coll/Makefile.am | 2 +- ompi/dynamic-mca/common/Makefile.am | 2 +- ompi/dynamic-mca/io/Makefile.am | 2 +- ompi/dynamic-mca/mpool/Makefile.am | 2 +- ompi/dynamic-mca/pml/Makefile.am | 2 +- ompi/dynamic-mca/ptl/Makefile.am | 2 +- ompi/dynamic-mca/topo/Makefile.am | 2 +- ompi/errhandler/Makefile.am | 2 +- ompi/file/Makefile.am | 2 +- ompi/group/Makefile.am | 2 +- ompi/include/Makefile.am | 2 +- ompi/info/Makefile.am | 2 +- ompi/mca/Makefile.am | 2 +- ompi/mca/allocator/Makefile.am | 2 +- ompi/mca/allocator/base/Makefile.am | 2 +- ompi/mca/allocator/basic/Makefile.am | 2 +- ompi/mca/allocator/bucket/Makefile.am | 2 +- ompi/mca/bml/Makefile.am | 2 +- ompi/mca/bml/base/Makefile.am | 2 +- ompi/mca/bml/r2/Makefile.am | 2 +- ompi/mca/btl/Makefile.am | 2 +- ompi/mca/btl/base/Makefile.am | 1 - ompi/mca/btl/gm/Makefile.am | 2 +- ompi/mca/btl/mvapi/Makefile.am | 2 +- ompi/mca/btl/mx/Makefile.am | 2 +- ompi/mca/btl/openib/Makefile.am | 2 +- ompi/mca/btl/portals/Makefile.am | 2 +- ompi/mca/btl/self/Makefile.am | 2 +- ompi/mca/btl/sm/Makefile.am | 2 +- ompi/mca/btl/tcp/Makefile.am | 2 +- ompi/mca/btl/template/Makefile.am | 2 +- ompi/mca/coll/Makefile.am | 2 +- ompi/mca/coll/base/Makefile.am | 2 +- ompi/mca/coll/basic/Makefile.am | 2 +- ompi/mca/coll/self/Makefile.am | 2 +- ompi/mca/coll/sm/Makefile.am | 3 - ompi/mca/common/Makefile.am | 2 +- ompi/mca/common/sm/Makefile.am | 2 +- ompi/mca/io/Makefile.am | 2 +- ompi/mca/io/base/Makefile.am | 1 - ompi/mca/io/romio/Makefile.am | 2 +- ompi/mca/mpool/Makefile.am | 2 +- ompi/mca/mpool/base/Makefile.am | 2 +- ompi/mca/mpool/gm/Makefile.am | 2 +- ompi/mca/mpool/mvapi/Makefile.am | 2 +- ompi/mca/mpool/openib/Makefile.am | 2 +- ompi/mca/mpool/sm/Makefile.am | 2 +- ompi/mca/pml/Makefile.am | 2 +- ompi/mca/pml/base/Makefile.am | 2 +- ompi/mca/pml/example/Makefile.am | 2 +- ompi/mca/pml/ob1/Makefile.am | 2 +- ompi/mca/pml/teg/Makefile.am | 2 +- ompi/mca/pml/uniq/Makefile.am | 2 +- ompi/mca/ptl/Makefile.am | 2 +- ompi/mca/ptl/base/Makefile.am | 2 +- ompi/mca/ptl/mx/Makefile.am | 2 +- ompi/mca/ptl/portals/Makefile.am | 2 +- ompi/mca/ptl/prof/Makefile.am | 2 +- ompi/mca/ptl/self/Makefile.am | 2 +- ompi/mca/ptl/sm/Makefile.am | 2 +- ompi/mca/ptl/tcp/Makefile.am | 2 +- ompi/mca/topo/Makefile.am | 2 +- ompi/mca/topo/base/Makefile.am | 1 - ompi/mca/topo/unity/Makefile.am | 2 +- ompi/mpi/Makefile.am | 2 +- ompi/mpi/c/Makefile.am | 2 +- ompi/mpi/c/profile/Makefile.am | 2 +- ompi/mpi/cxx/Makefile.am | 2 +- ompi/mpi/f77/Makefile.am | 2 +- ompi/mpi/f77/profile/Makefile.am | 2 +- ompi/mpi/f90/Makefile.am | 2 +- ompi/mpi/f90/scripts/Makefile.am | 2 +- ompi/op/Makefile.am | 2 +- ompi/proc/Makefile.am | 2 +- ompi/request/Makefile.am | 2 +- ompi/runtime/Makefile.am | 2 +- ompi/tools/Makefile.am | 2 +- ompi/tools/ompi_info/Makefile.am | 2 +- ompi/tools/wrappers/Makefile.am | 2 +- ompi/win/Makefile.am | 2 +- opal/Makefile.am | 2 +- opal/asm/Makefile.am | 2 +- opal/class/Makefile.am | 2 +- opal/dynamic-mca/Makefile.am | 2 +- opal/dynamic-mca/maffinity/Makefile.am | 2 +- opal/dynamic-mca/memory/Makefile.am | 2 +- opal/dynamic-mca/paffinity/Makefile.am | 2 +- opal/dynamic-mca/timer/Makefile.am | 2 +- opal/event/Makefile.am | 2 +- opal/event/compat/Makefile.am | 2 +- opal/event/compat/sys/Makefile.am | 2 +- opal/include/Makefile.am | 2 +- opal/include/sys/Makefile.am | 2 +- opal/include/sys/alpha/Makefile.am | 2 +- opal/include/sys/amd64/Makefile.am | 2 +- opal/include/sys/ia32/Makefile.am | 2 +- opal/include/sys/ia64/Makefile.am | 2 +- opal/include/sys/mips/Makefile.am | 2 +- opal/include/sys/powerpc/Makefile.am | 2 +- opal/include/sys/sparc/Makefile.am | 2 +- opal/include/sys/sparcv9/Makefile.am | 2 +- opal/include/sys/win32/Makefile.am | 2 +- opal/mca/Makefile.am | 2 +- opal/mca/base/Makefile.am | 2 +- opal/mca/maffinity/Makefile.am | 2 +- opal/mca/maffinity/base/Makefile.am | 2 +- opal/mca/maffinity/first_use/Makefile.am | 2 +- opal/mca/memory/Makefile.am | 2 +- opal/mca/memory/base/Makefile.am | 2 +- opal/mca/memory/darwin/Makefile.am | 2 +- opal/mca/memory/malloc_hooks/Makefile.am | 2 +- opal/mca/memory/malloc_interpose/Makefile.am | 2 +- opal/mca/memory/ptmalloc2/Makefile.am | 2 +- opal/mca/paffinity/Makefile.am | 2 +- opal/mca/paffinity/base/Makefile.am | 2 +- opal/mca/paffinity/linux/Makefile.am | 2 +- opal/mca/paffinity/solaris/Makefile.am | 2 +- opal/mca/timer/Makefile.am | 2 +- opal/mca/timer/aix/Makefile.am | 2 +- opal/mca/timer/altix/Makefile.am | 2 +- opal/mca/timer/base/Makefile.am | 2 +- opal/mca/timer/darwin/Makefile.am | 2 +- opal/mca/timer/linux/Makefile.am | 2 +- opal/mca/timer/solaris/Makefile.am | 2 +- opal/memory/Makefile.am | 2 +- opal/runtime/Makefile.am | 2 +- opal/threads/Makefile.am | 2 +- opal/util/Makefile.am | 2 +- orte/Makefile.am | 2 +- orte/class/Makefile.am | 2 +- orte/dps/Makefile.am | 2 +- orte/dynamic-mca/Makefile.am | 2 +- orte/dynamic-mca/errmgr/Makefile.am | 2 +- orte/dynamic-mca/gpr/Makefile.am | 2 +- orte/dynamic-mca/iof/Makefile.am | 2 +- orte/dynamic-mca/ns/Makefile.am | 2 +- orte/dynamic-mca/oob/Makefile.am | 2 +- orte/dynamic-mca/pls/Makefile.am | 2 +- orte/dynamic-mca/ras/Makefile.am | 2 +- orte/dynamic-mca/rds/Makefile.am | 2 +- orte/dynamic-mca/rmaps/Makefile.am | 2 +- orte/dynamic-mca/rmgr/Makefile.am | 2 +- orte/dynamic-mca/rml/Makefile.am | 2 +- orte/dynamic-mca/schema/Makefile.am | 2 +- orte/dynamic-mca/sds/Makefile.am | 2 +- orte/dynamic-mca/soh/Makefile.am | 2 +- orte/include/Makefile.am | 2 +- orte/mca/Makefile.am | 2 +- orte/mca/errmgr/Makefile.am | 2 +- orte/mca/errmgr/base/Makefile.am | 2 +- orte/mca/gpr/Makefile.am | 2 +- orte/mca/gpr/base/Makefile.am | 2 +- orte/mca/gpr/null/Makefile.am | 2 +- orte/mca/gpr/proxy/Makefile.am | 2 +- orte/mca/gpr/replica/Makefile.am | 2 +- orte/mca/gpr/replica/api_layer/Makefile.am | 2 +- .../gpr/replica/communications/Makefile.am | 2 +- .../gpr/replica/functional_layer/Makefile.am | 2 +- .../gpr/replica/transition_layer/Makefile.am | 2 +- orte/mca/iof/Makefile.am | 2 +- orte/mca/iof/base/Makefile.am | 1 - orte/mca/iof/null/Makefile.am | 2 +- orte/mca/iof/proxy/Makefile.am | 2 +- orte/mca/iof/svc/Makefile.am | 2 +- orte/mca/ns/Makefile.am | 2 +- orte/mca/ns/base/Makefile.am | 2 +- orte/mca/ns/proxy/Makefile.am | 2 +- orte/mca/ns/replica/Makefile.am | 2 +- orte/mca/oob/Makefile.am | 2 +- orte/mca/oob/base/Makefile.am | 2 +- orte/mca/oob/tcp/Makefile.am | 2 +- orte/mca/pls/Makefile.am | 2 +- orte/mca/pls/base/Makefile.am | 2 +- orte/mca/pls/bproc/Makefile.am | 2 +- orte/mca/pls/bproc_orted/Makefile.am | 2 +- orte/mca/pls/bproc_seed/Makefile.am | 2 +- orte/mca/pls/daemon/Makefile.am | 2 +- orte/mca/pls/fork/Makefile.am | 2 +- orte/mca/pls/poe/Makefile.am | 2 +- orte/mca/pls/proxy/Makefile.am | 2 +- orte/mca/pls/rsh/Makefile.am | 2 +- orte/mca/pls/slurm/Makefile.am | 2 +- orte/mca/pls/tm/Makefile.am | 2 +- orte/mca/pls/xgrid/Makefile.am | 2 +- orte/mca/ras/Makefile.am | 2 +- orte/mca/ras/base/Makefile.am | 2 +- orte/mca/ras/bjs/Makefile.am | 2 +- orte/mca/ras/host/Makefile.am | 2 +- orte/mca/ras/lsf_bproc/Makefile.am | 2 +- orte/mca/ras/slurm/Makefile.am | 2 +- orte/mca/ras/tm/Makefile.am | 2 +- orte/mca/ras/xgrid/Makefile.am | 2 +- orte/mca/rds/Makefile.am | 2 +- orte/mca/rds/base/Makefile.am | 2 +- orte/mca/rds/hostfile/Makefile.am | 2 +- orte/mca/rds/resfile/Makefile.am | 2 +- orte/mca/rmaps/Makefile.am | 2 +- orte/mca/rmaps/base/Makefile.am | 2 +- orte/mca/rmaps/round_robin/Makefile.am | 2 +- orte/mca/rmgr/Makefile.am | 2 +- orte/mca/rmgr/base/Makefile.am | 2 +- orte/mca/rmgr/proxy/Makefile.am | 2 +- orte/mca/rmgr/urm/Makefile.am | 2 +- orte/mca/rml/Makefile.am | 2 +- orte/mca/rml/base/Makefile.am | 1 - orte/mca/rml/cnos/Makefile.am | 2 +- orte/mca/rml/oob/Makefile.am | 2 +- orte/mca/schema/Makefile.am | 2 +- orte/mca/schema/base/Makefile.am | 1 - orte/mca/sds/Makefile.am | 2 +- orte/mca/sds/base/Makefile.am | 1 - orte/mca/sds/bproc/Makefile.am | 2 +- orte/mca/sds/cnos/Makefile.am | 2 +- orte/mca/sds/env/Makefile.am | 2 +- orte/mca/sds/pipe/Makefile.am | 2 +- orte/mca/sds/portals_utcp/Makefile.am | 2 +- orte/mca/sds/seed/Makefile.am | 2 +- orte/mca/sds/singleton/Makefile.am | 2 +- orte/mca/sds/slurm/Makefile.am | 2 +- orte/mca/soh/Makefile.am | 2 +- orte/mca/soh/base/Makefile.am | 2 +- orte/mca/soh/bproc/Makefile.am | 2 +- orte/runtime/Makefile.am | 2 +- orte/tools/Makefile.am | 2 +- orte/tools/console/Makefile.am | 2 +- orte/tools/openmpi/Makefile.am | 2 +- orte/tools/orted/Makefile.am | 2 +- orte/tools/orteprobe/Makefile.am | 2 +- orte/tools/orterun/Makefile.am | 2 +- orte/util/Makefile.am | 2 +- test/Makefile.am | 2 +- test/asm/Makefile.am | 2 +- test/class/Makefile.am | 2 +- test/dps/Makefile.am | 2 +- test/mca/Makefile.am | 2 +- test/mca/gpr/Makefile.am | 2 +- test/mca/ns/Makefile.am | 2 +- test/mca/oob/Makefile.am | 2 +- test/mca/ras/Makefile.am | 2 +- test/mca/rds/Makefile.am | 2 +- test/mca/rmaps/Makefile.am | 2 +- test/mca/schema/Makefile.am | 3 +- test/memory/Makefile.am | 2 +- test/mpi/Makefile.am | 2 +- test/mpi/environment/Makefile.am | 2 +- test/runtime/Makefile.am | 2 +- test/support/Makefile.am | 4 +- test/threads/Makefile.am | 2 +- test/util/Makefile.am | 2 +- 270 files changed, 338 insertions(+), 320 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6fcd8b0df0..ea01550f17 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ # $HEADER$ # -include $(top_srcdir)/config/Makefile.options + SUBDIRS = config include etc contrib $(MCA_PROJECT_SUBDIRS) test EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE diff --git a/config/Makefile.am b/config/Makefile.am index b11b6a9a65..6f9d24e568 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -14,7 +14,7 @@ # $HEADER$ # -include $(top_srcdir)/config/Makefile.options + EXTRA_DIST = \ distscript.csh \ diff --git a/config/distscript.csh b/config/distscript.csh index fcdd72876c..d047d9b0c5 100755 --- a/config/distscript.csh +++ b/config/distscript.csh @@ -66,6 +66,8 @@ if ("$cur_svn_r" == "-1") then sed -e 's/^svn_r=.*/svn_r='$svn_r'/' VERSION > version.new cp version.new VERSION rm -f version.new + # need to reset the timestamp to not annoy AM dependencies + touch -r "$srcdir/VERSION" VERSION echo "*** Updated VERSION file with SVN r number" else echo "*** Did NOT updated VERSION file with SVN r number" diff --git a/config/ompi_get_libtool_linker_flags.m4 b/config/ompi_get_libtool_linker_flags.m4 index f05e4eb189..962e5b6eb2 100644 --- a/config/ompi_get_libtool_linker_flags.m4 +++ b/config/ompi_get_libtool_linker_flags.m4 @@ -62,16 +62,16 @@ ompi_check_linker_flags_work() { # First make a sample library with the current LDFLAGS and LIBS # -cmd="$libtool --mode=compile $CC $CFLAGS foo.c -c -o foo.o" +cmd="$libtool --mode=compile --tag=CC $CC $CFLAGS foo.c -c -o foo.o" ompi_check_linker_flags_work -cmd="$libtool --mode=link $CC $CFLAGS foo.lo $LDFLAGS $LIBS -o libfoo.la" +cmd="$libtool --mode=link --tag=CC $CC $CFLAGS foo.lo $LDFLAGS $LIBS -o libfoo.la" ompi_check_linker_flags_work # # Now fake linking to it and capture the output from libtool # -cmd="$libtool --dry-run --mode=link $CC bar.lo libfoo.la -o bar $extra_flags" +cmd="$libtool --dry-run --mode=link --tag=CC $CC bar.lo libfoo.la -o bar $extra_flags" ompi_check_linker_flags_work yes eval "set $output" diff --git a/config/ompi_get_version.sh b/config/ompi_get_version.sh index d2b656dac6..865b7ee054 100755 --- a/config/ompi_get_version.sh +++ b/config/ompi_get_version.sh @@ -48,6 +48,8 @@ else OMPI_VERSION="${OMPI_VERSION}b$OMPI_BETA_VERSION" fi + OMPI_BASE_VERSION="$OMPI_VERSION" + if test "$OMPI_WANT_SVN" = "1"; then if test "$OMPI_SVN_R" = "-1"; then if test -d .svn; then @@ -87,6 +89,9 @@ case "$option" in --svn) echo $OMPI_SVN_R ;; + --base) + echo $OMPI_BASE_VERSION + ;; --all) echo ${OMPI_VERSION} ${OMPI_MAJOR_VERSION} ${OMPI_MINOR_VERSION} ${OMPI_RELEASE_VERSION} ${OMPI_ALPHA_VERSION} ${OMPI_BETA_VERSION} ${OMPI_SVN_R} ;; @@ -104,6 +109,7 @@ $0 [