Skip to content

Commit

Permalink
Revert "Update to sync with OMPI master and cleanup to build"
Browse files Browse the repository at this point in the history 
This reverts commit cb55c88.
  • Loading branch information
Ralph Castain committed Nov 22, 2016
1 parent cb55c88 commit 1e2019c
Show file tree
Hide file tree
Showing 4,869 changed files with 668,745 additions and 138 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions Makefile.am
View file
Expand Up @@ -11,15 +11,15 @@
# All rights reserved.
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2012-2015 Los Alamos National Security, Inc. All rights reserved.
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
# Copyright (c) 2014 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#

SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS)
SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS) test
EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.pl README.JAVA.txt

include examples/Makefile.include
Expand Down
16 changes: 12 additions & 4 deletions Makefile.ompi-rules
View file
@@ -1,7 +1,6 @@
# -*- makefile -*-
# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
# Copyright (c) 2016 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -10,9 +9,18 @@
#

TRIM_OPTIONS=
if ! MAN_PAGE_BUILD_MPI_CXX_BINDINGS
TRIM_OPTIONS += --nocxx
endif
if ! MAN_PAGE_BUILD_MPIFH_BINDINGS
TRIM_OPTIONS += --nofortran
endif
if ! MAN_PAGE_BUILD_USEMPIF08_BINDINGS
TRIM_OPTIONS += --nof08
endif

.1in.1:
$(OMPI_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
--package-name='@PACKAGE_NAME@' \
--package-version='@PACKAGE_VERSION@' \
--ompi-date='@OMPI_RELEASE_DATE@' \
Expand All @@ -22,7 +30,7 @@ TRIM_OPTIONS=
--output=$@

.3in.3:
$(OMPI_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
--package-name='@PACKAGE_NAME@' \
--package-version='@PACKAGE_VERSION@' \
--ompi-date='@OMPI_RELEASE_DATE@' \
Expand All @@ -33,7 +41,7 @@ TRIM_OPTIONS=
--output=$@

.7in.7:
$(OMPI_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
--package-name='@PACKAGE_NAME@' \
--package-version='@PACKAGE_VERSION@' \
--ompi-date='@OMPI_RELEASE_DATE@' \
Expand Down

0 comments on commit 1e2019c

Please sign in to comment.