This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 8448badc4099f6b0ded16e02aeb0ecd60178ffa7 (commit) from 8390fb6abce79734c20db035b4c23f4a0487fa14 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/8448badc4099f6b0ded16e02aeb0ecd601... commit 8448badc4099f6b0ded16e02aeb0ecd60178ffa7 Author: Pavan Balaji <[email protected]> Date: Mon Jul 8 18:46:16 2013 -0500 Remove unused mpicc.conf.in and friends. diff --git a/configure.ac b/configure.ac index 4910610..fe8194e 100644 --- a/configure.ac +++ b/configure.ac @@ -712,7 +712,7 @@ PAC_ARG_STRICT # ----------------------------------------------------------------------------- # First check that we have a clean build if we are doing a VPATH build -PAC_VPATH_CHECK(src/include/mpi.h src/env/mpicc src/env/mpicc.conf,lib) +PAC_VPATH_CHECK(src/include/mpi.h src/env/mpicc,lib) # ---------------------------------------------------------------------------- # This test is complicated by the fact that top_srcdir is not set until @@ -6196,16 +6196,12 @@ AC_OUTPUT(Makefile \ src/packaging/envmods/mpich.module \ src/env/mpixxx_opts.conf \ src/env/mpicc.sh \ - src/env/mpicc.conf \ src/env/mpicc.bash \ src/env/mpicxx.sh \ - src/env/mpicxx.conf \ src/env/mpicxx.bash \ src/env/mpif77.sh \ - src/env/mpif77.conf \ src/env/mpif77.bash \ src/env/mpif90.sh \ - src/env/mpif90.conf \ src/env/mpif90.bash \ src/env/parkill \ src/util/dbg/getfuncstack \ diff --git a/src/env/Makefile.mk b/src/env/Makefile.mk index 113d917..9d398b0 100644 --- a/src/env/Makefile.mk +++ b/src/env/Makefile.mk @@ -19,29 +19,20 @@ endif BUILD_PROFILING_LIB src_env_mpichversion_LDFLAGS = $(mpich_libtool_static_flag) -sysconf_DATA += src/env/mpicc.conf - if BUILD_F77_BINDING bin_SCRIPTS += src/env/mpif77 -sysconf_DATA += src/env/mpif77.conf endif BUILD_F77_BINDING if BUILD_F90_LIB bin_SCRIPTS += src/env/mpif90 -sysconf_DATA += src/env/mpif90.conf endif BUILD_F90_LIB if BUILD_CXX_LIB bin_SCRIPTS += src/env/mpicxx -sysconf_DATA += src/env/mpicxx.conf endif BUILD_CXX_LIB # create a local copy of the compiler wrapper that will actually be installed if BUILD_BASH_SCRIPTS -src/env/mpicc.bash: $(top_builddir)/src/env/mpicc.conf -src/env/mpicxx.bash: $(top_builddir)/src/env/mpicxx.conf -src/env/mpif77.bash: $(top_builddir)/src/env/mpif77.conf -src/env/mpif90.bash: $(top_builddir)/src/env/mpif90.conf src/env/mpicc: $(top_builddir)/src/env/mpicc.bash cp -p $? $@ src/env/mpicxx: $(top_builddir)/src/env/mpicxx.bash @@ -51,10 +42,6 @@ src/env/mpif77: $(top_builddir)/src/env/mpif77.bash src/env/mpif90: $(top_builddir)/src/env/mpif90.bash cp -p $? $@ else !BUILD_BASH_SCRIPTS -src/env/mpicc.sh: $(top_builddir)/src/env/mpicc.conf -src/env/mpicxx.sh: $(top_builddir)/src/env/mpicxx.conf -src/env/mpif77.sh: $(top_builddir)/src/env/mpif77.conf -src/env/mpif90.sh: $(top_builddir)/src/env/mpif90.conf src/env/mpicc: $(top_builddir)/src/env/mpicc.sh cp -p $? $@ src/env/mpicxx: $(top_builddir)/src/env/mpicxx.sh @@ -81,4 +68,3 @@ wrapper_doc_src = src/env/mpicc.txt \ src/env/mpiexec.txt doc1_src_txt += $(wrapper_doc_src) EXTRA_DIST += $(wrapper_doc_src) - diff --git a/src/env/mpicc.conf.in b/src/env/mpicc.conf.in deleted file mode 100644 index e7fe5fd..0000000 --- a/src/env/mpicc.conf.in +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh -# -# This file contains configuration information for mpicc. This is -# essentially just the variable-initialization part of mpicc. -# -------------------------------------------------------------------------- -# Set the default values of all variables. -# -# Directory locations: Fixed for any MPI implementation. -# Set from the directory arguments to configure (e.g., --prefix=/usr/local) -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sysconfdir=@sysconfdir@ -includedir=@includedir@ -libdir=@libdir@ - -# Default settings for compiler, flags, and libraries. -# Determined by a combination of environment variables and tests within -# configure (e.g., determining whehter -lsocket is needee) -CC="@CC@" -CFLAGS="@WRAPPER_CFLAGS@" -CPPFLAGS="@WRAPPER_CPPFLAGS@" -LDFLAGS="@WRAPPER_LDFLAGS@" -LIBS="@WRAPPER_LIBS@" -MPICH_VERSION="@MPICH_VERSION@" diff --git a/src/env/mpicxx.conf.in b/src/env/mpicxx.conf.in deleted file mode 100644 index 30c9bc4..0000000 --- a/src/env/mpicxx.conf.in +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh -# -# This file contains configuration information for mpicxx. This is -# essentially just the variable-initialization part of mpicxx. -# -------------------------------------------------------------------------- -# Set the default values of all variables. -# -# Directory locations: Fixed for any MPI implementation. -# Set from the directory arguments to configure (e.g., --prefix=/usr/local) -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sysconfdir=@sysconfdir@ -includedir=@includedir@ -libdir=@libdir@ - -# Default settings for compiler, flags, and libraries. -# Determined by a combination of environment variables and tests within -# configure (e.g., determining whehter -lsocket is needee) -CXX="@CXX@" -CXXFLAGS="@WRAPPER_CXXFLAGS@" -LDFLAGS="@WRAPPER_LDFLAGS@" -LIBS="@WRAPPER_LIBS@" -MPICXXLIBNAME="@MPICXXLIBNAME@" -MPICH_VERSION="@MPICH_VERSION@" diff --git a/src/env/mpif77.conf.in b/src/env/mpif77.conf.in deleted file mode 100644 index 3b83acc..0000000 --- a/src/env/mpif77.conf.in +++ /dev/null @@ -1,48 +0,0 @@ -#! /bin/sh -# -# This file contains configuration information for mpif77. This is -# essentially just the variable-initialization part of mpif77. -# -------------------------------------------------------------------------- -# Set the default values of all variables. -# -# Directory locations: Fixed for any MPI implementation -# Set from the directory arguments to configure (e.g., --prefix=/usr/local) -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sysconfdir=@sysconfdir@ -includedir=@includedir@ -libdir=@libdir@ - -# Default settings for compiler, flags, and libraries -# Determined by a combination of environment variables and tests within -# configure (e.g., determining whehter -lsocket is needee) -F77="@F77@" -F77CPP="@F77CPP@" -FFLAGS="@WRAPPER_FFLAGS@" -LDFLAGS="@WRAPPER_LDFLAGS@" -LIBS="@WRAPPER_LIBS@" -MPICH_VERSION="@MPICH_VERSION@" -# -# ---------------------------------------------------------------------------- -# We also keep track of properties of the compilation system. These -# are read by the top-level configure to initialize the Fortran types -# within the mpi.h file. -# -# MPI Types for the Fortran types -MPI_COMPLEX=@MPI_COMPLEX@ -MPI_DOUBLE_COMPLEX=@MPI_DOUBLE_COMPLEX@ -MPI_LOGICAL=@MPI_LOGICAL@ -MPI_REAL=@MPI_REAL@ -MPI_DOUBLE_PRECISION=@MPI_DOUBLE_PRECISION@ -MPI_INTEGER=@MPI_INTEGER@ -MPI_2INTEGER=@MPI_2INTEGER@ -MPI_2COMPLEX=@MPI_2COMPLEX@ -MPI_2DOUBLE_COMPLEX=@MPI_2DOUBLE_COMPLEX@ -MPI_2REAL=@MPI_2REAL@ -MPI_2DOUBLE_PRECISION=@MPI_2DOUBLE_PRECISION@ -MPI_CHARACTER=@MPI_CHARACTER@ -# C type corresponding to a Fortran INTEGER -MPI_FINT=@MPI_FINT@ -# -# Name mangling -F77_NAME_MANGLE=@F77_NAME_MANGLE@ diff --git a/src/env/mpif90.conf.in b/src/env/mpif90.conf.in deleted file mode 100644 index 800a8ba..0000000 --- a/src/env/mpif90.conf.in +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh -# -# This file contains configuration information for mpicc. This is -# essentially just the variable-initialization part of mpif90. -# -------------------------------------------------------------------------- -# Set the default values of all variables. -# -# Directory locations: Fixed for any MPI implementation. -# Set from the directory arguments to configure (e.g., --prefix=/usr/local) -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sysconfdir=@sysconfdir@ -includedir=@includedir@ -libdir=@libdir@ - -# Default settings for compiler, flags, and libraries -# Determined by a combination of environment variables and tests within -# configure (e.g., determining whehter -lsocket is needee) -FC="@FC@" -FCCPP="@FCCPP@" -# Fortran 90 Compiler characteristics -FCINC="@FCINC@" -# f90modinc specifies how to add a directory to the search path for modules. -# Some compilers (Intel ifc version 5) do not support this concept, and -# instead need -# a specific list of files that contain module names and directories. -# The FCMODINCSPEC is a more general approach that uses <dir> and <file> -# for the directory and file respectively. -FCMODINC="@FCMODINCFLAG@" -FCMODINCSPEC="@FCMODINCSPEC@" -FCEXT="@FCEXT@" -FCFLAGS="@WRAPPER_FCFLAGS@" -LDFLAGS="@WRAPPER_LDFLAGS@" -LIBS="@WRAPPER_LIBS@" -MPICH_VERSION="@MPICH_VERSION@" ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 +----- src/env/Makefile.mk | 14 -------------- src/env/mpicc.conf.in | 24 ------------------------ src/env/mpicxx.conf.in | 24 ------------------------ src/env/mpif77.conf.in | 48 ------------------------------------------------ src/env/mpif90.conf.in | 35 ----------------------------------- 6 files changed, 1 insertions(+), 150 deletions(-) delete mode 100644 src/env/mpicc.conf.in delete mode 100644 src/env/mpicxx.conf.in delete mode 100644 src/env/mpif77.conf.in delete mode 100644 src/env/mpif90.conf.in hooks/post-receive -- MPICH primary repository