Skip to content

Commit cb55c88

Browse files
author
Ralph Castain
committed
Update to sync with OMPI master and cleanup to build
Signed-off-by: Ralph Castain <[email protected]>
1 parent 0c8359b commit cb55c88

File tree

4,869 files changed

+138
-668745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,869 files changed

+138
-668745
lines changed

‎Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
# All rights reserved.
1212
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2012-2015 Los Alamos National Security, Inc. All rights reserved.
14-
# Copyright (c) 2014 Intel, Inc. All rights reserved.
14+
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
1515
# $COPYRIGHT$
1616
#
1717
# Additional copyrights may follow
1818
#
1919
# $HEADER$
2020
#
2121

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

2525
include examples/Makefile.include

‎Makefile.ompi-rules

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- makefile -*-
22
# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
33
# Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
4+
# Copyright (c) 2016 Intel, Inc. All rights reserved.
45
# $COPYRIGHT$
56
#
67
# Additional copyrights may follow
@@ -9,18 +10,9 @@
910
#
1011

1112
TRIM_OPTIONS=
12-
if ! MAN_PAGE_BUILD_MPI_CXX_BINDINGS
13-
TRIM_OPTIONS += --nocxx
14-
endif
15-
if ! MAN_PAGE_BUILD_MPIFH_BINDINGS
16-
TRIM_OPTIONS += --nofortran
17-
endif
18-
if ! MAN_PAGE_BUILD_USEMPIF08_BINDINGS
19-
TRIM_OPTIONS += --nof08
20-
endif
2113

2214
.1in.1:
23-
$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
15+
$(OMPI_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
2416
--package-name='@PACKAGE_NAME@' \
2517
--package-version='@PACKAGE_VERSION@' \
2618
--ompi-date='@OMPI_RELEASE_DATE@' \
@@ -30,7 +22,7 @@ endif
3022
--output=$@
3123

3224
.3in.3:
33-
$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
25+
$(OMPI_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
3426
--package-name='@PACKAGE_NAME@' \
3527
--package-version='@PACKAGE_VERSION@' \
3628
--ompi-date='@OMPI_RELEASE_DATE@' \
@@ -41,7 +33,7 @@ endif
4133
--output=$@
4234

4335
.7in.7:
44-
$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
36+
$(OMPI_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
4537
--package-name='@PACKAGE_NAME@' \
4638
--package-version='@PACKAGE_VERSION@' \
4739
--ompi-date='@OMPI_RELEASE_DATE@' \

0 commit comments

Comments
 (0)