Skip to content

Commit 1e2019c

Browse files
author
Ralph Castain
committed
Revert "Update to sync with OMPI master and cleanup to build"
This reverts commit cb55c88.
1 parent cb55c88 commit 1e2019c

File tree

4,869 files changed

+668745
-138
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

+668745
-138
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-2016 Intel, Inc. All rights reserved.
14+
# Copyright (c) 2014 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)
22+
SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS) test
2323
EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.pl README.JAVA.txt
2424

2525
include examples/Makefile.include

‎Makefile.ompi-rules

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
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.
54
# $COPYRIGHT$
65
#
76
# Additional copyrights may follow
@@ -10,9 +9,18 @@
109
#
1110

1211
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
1321

1422
.1in.1:
15-
$(OMPI_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
23+
$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
1624
--package-name='@PACKAGE_NAME@' \
1725
--package-version='@PACKAGE_VERSION@' \
1826
--ompi-date='@OMPI_RELEASE_DATE@' \
@@ -22,7 +30,7 @@ TRIM_OPTIONS=
2230
--output=$@
2331

2432
.3in.3:
25-
$(OMPI_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
33+
$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
2634
--package-name='@PACKAGE_NAME@' \
2735
--package-version='@PACKAGE_VERSION@' \
2836
--ompi-date='@OMPI_RELEASE_DATE@' \
@@ -33,7 +41,7 @@ TRIM_OPTIONS=
3341
--output=$@
3442

3543
.7in.7:
36-
$(OMPI_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
44+
$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
3745
--package-name='@PACKAGE_NAME@' \
3846
--package-version='@PACKAGE_VERSION@' \
3947
--ompi-date='@OMPI_RELEASE_DATE@' \

0 commit comments

Comments
 (0)