@@ -796,29 +796,41 @@ EXTRA_DIST += \
796
796
# ##########################################################################
797
797
798
798
# These files are not generated by Sphinx (they are redirects to
799
- # Sphinx-generated man pages).
800
- OMPI_MAN1_REDIRECTS = \
801
- man-openmpi/man1/mpicc.1 \
799
+ # Sphinx-generated man pages) -- they exist directly in Git. We
800
+ # *always* want these files to be in EXTRA_DIST (so that they're in
801
+ # distribution tarballs). We'll decide later whether we install each
802
+ # of these (e.g., if configure disabled the Java bindings, we won't
803
+ # install mpijavac.1).
804
+ OMPI_MAN1_C_REDIRECTS = man-openmpi/man1/mpicc.1
805
+ OMPI_MAN1_CXX_REDIRECTS = \
802
806
man-openmpi/man1/mpicxx.1 \
803
- man-openmpi/man1/mpic++.1 \
807
+ man-openmpi/man1/mpic++.1
808
+ OMPI_MAN1_FORTRAN_REDIRECTS = \
804
809
man-openmpi/man1/mpifort.1 \
805
810
man-openmpi/man1/mpif77.1 \
806
- man-openmpi/man1/mpif90.1 \
807
- man-openmpi/man1/mpijavac.1
811
+ man-openmpi/man1/mpif90.1
812
+ OMPI_MAN1_JAVA_REDIRECTS = man-openmpi/man1/mpijavac.1
808
813
809
- OSHMEM_MAN1_REDIRECTS = \
814
+ OSHMEM_MAN1_C_REDIRECTS = \
810
815
man-openshmem/man1/oshcc.1 \
816
+ man-openshmem/man1/shmemcc.1
817
+ OSHMEM_MAN1_CXX_REDIRECTS = \
811
818
man-openshmem/man1/oshcxx.1 \
812
819
man-openshmem/man1/oshc++.1 \
813
- man-openshmem/man1/oshfort.1 \
814
- man-openshmem/man1/shmemcc.1 \
815
820
man-openshmem/man1/shmemcxx.1 \
816
- man-openshmem/man1/shmemc++.1 \
821
+ man-openshmem/man1/shmemc++.1
822
+ OSHMEM_MAN1_FORTRAN_REDIRECTS = \
823
+ man-openshmem/man1/oshfort.1 \
817
824
man-openshmem/man1/shmemfort.1
818
825
819
826
EXTRA_DIST += \
820
- $(OMPI_MAN1_REDIRECTS ) \
821
- $(OSHMEM_MAN1_REDIRECTS )
827
+ $(OMPI_MAN1_C_REDIRECTS ) \
828
+ $(OMPI_MAN1_CXX_REDIRECTS ) \
829
+ $(OMPI_MAN1_FORTRAN_REDIRECTS ) \
830
+ $(OMPI_MAN1_JAVA_REDIRECTS ) \
831
+ $(OSHMEM_MAN1_C_REDIRECTS ) \
832
+ $(OSHMEM_MAN1_CXX_REDIRECTS ) \
833
+ $(OSHMEM_MAN1_FORTRAN_REDIRECTS )
822
834
823
835
# ##########################################################################
824
836
if OPAL_BUILD_DOCS
@@ -877,15 +889,32 @@ if OPAL_INSTALL_DOCS
877
889
878
890
man1_MANS = \
879
891
$(OMPI_MAN1_BUILT ) \
880
- $(OMPI_MAN1_REDIRECTS )
892
+ $(OMPI_MAN1_C_REDIRECTS )
893
+ if OMPI_HAVE_CXX_COMPILER
894
+ man1_MANS += $(OMPI_MAN1_CXX_REDIRECTS )
895
+ endif
896
+ if OMPI_BUILD_ANY_FORTRAN_BINDINGS
897
+ man1_MANS += $(OMPI_MAN1_FORTRAN_REDIRECTS )
898
+ endif
899
+ if OMPI_WANT_JAVA_BINDINGS
900
+ man1_MANS += $(OMPI_MAN1_JAVA_REDIRECTS )
901
+ endif
881
902
882
903
man3_MANS = $(OMPI_MAN3_BUILT )
883
904
man5_MANS = $(OMPI_MAN5_BUILT )
884
905
885
906
if PROJECT_OSHMEM
886
907
man1_MANS += \
887
908
$(OSHMEM_MAN1_BUILT ) \
888
- $(OSHMEM_MAN1_REDIRECTS )
909
+ $(OSHMEM_MAN1_C_REDIRECTS )
910
+ # There is no OSHMEM equivalent of this conditional; just use the OMPI
911
+ # conditional.
912
+ if OMPI_HAVE_CXX_COMPILER
913
+ man1_MANS += $(OSHMEM_MAN1_CXX_REDIRECTS )
914
+ endif
915
+ if OSHMEM_BUILD_FORTRAN_BINDINGS
916
+ man1_MANS += $(OSHMEM_MAN1_FORTRAN_REDIRECTS )
917
+ endif
889
918
890
919
man3_MANS += $(OSHMEM_MAN3_BUILT )
891
920
endif
0 commit comments