fortran interfaces: more makefile refactor

hppritcha · hppritcha · commit d2162e75207e · 2025-03-20T08:03:48.000-06:00
and other PR feedback addressing

Signed-off-by: Howard Pritchard &lt;howardp@lanl.gov&gt;
diff --git a/ompi/mpi/fortran/use-mpi-f08/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/Makefile.am
@@ -444,7 +444,7 @@ api_f08_generated.F90: $(prototype_files)
 	    --lang fortran \
 	    --prototype-files $(prototype_files)
 
-EXTRA_DIST = $(extra_dist_prototype_files)
+EXTRA_DIST = $(prototype_files)
 
 # Delete generated file on maintainer-clean
 MAINTAINERCLEANFILES = api_f08_generated.F90
diff --git a/ompi/mpi/fortran/use-mpi-f08/Makefile.prototype_files b/ompi/mpi/fortran/use-mpi-f08/Makefile.prototype_files
@@ -3,169 +3,167 @@
 #
 
 prototype_files = \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/accumulate_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/allgather_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/allgather_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/allgatherv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/allgatherv_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/allreduce_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/allreduce_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/alltoall_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/alltoall_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/alltoallv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/alltoallv_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/alltoallw_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/alltoallw_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/bcast_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/bcast_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/bsend_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/bsend_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/buffer_attach_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/buffer_detach.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/compare_and_swap_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/exscan_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/exscan_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/fetch_and_op_ts.c.in \
-	$(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/f_sync_reg_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iread_all_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iread_at_all_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iread_at_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iread_shared_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iread_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iwrite_all_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_all_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iwrite_shared_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_iwrite_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_all_begin_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_all_end_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_all_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_begin_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_end_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_at_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_begin_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_end_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_shared_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_read_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_all_begin_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_all_end_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_all_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_begin_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_end_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_at_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_begin_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_end_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_shared_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/file_write_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/free_mem_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/gather_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/gather_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/gatherv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/gatherv_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/get_address_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/get_accumulate_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/get_count.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/get_elements.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/get_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/iallgather_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/iallgatherv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/iallreduce_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ialltoall_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ialltoallv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ialltoallw_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ibcast_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ibsend_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/iexscan_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/igather_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/igatherv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/imrecv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgather_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoall_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallw_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/irecv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_block_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ireduce_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/irsend_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/iscan_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/iscatter_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/iscatterv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/isendrecv_replace_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/isendrecv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/isend_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/issend_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/mrecv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallw_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallw_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/recv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/reduce_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/reduce_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/send_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/testany.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/waitall.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/win_attach_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/win_shared_query.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/win_create_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/win_detach_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/win_allocate.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/win_allocate_shared.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/unpack_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/unpack_external_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/pack_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/pack_size.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/pack_external_size.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/pack_external_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/put_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/raccumulate_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/recv_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/reduce_local_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_block_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_block_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/rget_accumulate_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/rget_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/rput_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/rsend_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/rsend_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/scan_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/scan_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/scatter_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/scatter_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/scatterv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/scatterv_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/send_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/sendrecv_replace_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/sendrecv_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ssend_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/ssend_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_vector.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_size.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_indexed.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_contiguous.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_create_darray.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_get_true_extent.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_create_subarray.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_create_struct.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed_block.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_create_indexed_block.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/type_create_hvector.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/psend_init_ts.c.in \
-        $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/precv_init_ts.c.in
-
-extra_dist_prototype_files =$(subst $(abs_top_srcdir)/ompi/mpi/fortran/use-mpi-f08/,,$(prototype_files))
+        accumulate_ts.c.in \
+        allgather_init_ts.c.in \
+        allgather_ts.c.in \
+        allgatherv_init_ts.c.in \
+        allgatherv_ts.c.in \
+        allreduce_init_ts.c.in \
+        allreduce_ts.c.in \
+        alltoall_init_ts.c.in \
+        alltoall_ts.c.in \
+        alltoallv_init_ts.c.in \
+        alltoallv_ts.c.in \
+        alltoallw_init_ts.c.in \
+        alltoallw_ts.c.in \
+        bcast_init_ts.c.in \
+        bcast_ts.c.in \
+        bsend_init_ts.c.in \
+        bsend_ts.c.in \
+        buffer_attach_ts.c.in \
+        buffer_detach.c.in \
+        compare_and_swap_ts.c.in \
+        exscan_init_ts.c.in \
+        exscan_ts.c.in \
+        fetch_and_op_ts.c.in \
+        file_iread_all_ts.c.in \
+        file_iread_at_all_ts.c.in \
+        file_iread_at_ts.c.in \
+        file_iread_shared_ts.c.in \
+        file_iread_ts.c.in \
+        file_iwrite_all_ts.c.in \
+        file_iwrite_at_all_ts.c.in \
+        file_iwrite_at_ts.c.in \
+        file_iwrite_shared_ts.c.in \
+        file_iwrite_ts.c.in \
+        file_read_all_begin_ts.c.in \
+        file_read_all_end_ts.c.in \
+        file_read_all_ts.c.in \
+        file_read_at_all_begin_ts.c.in \
+        file_read_at_all_end_ts.c.in \
+        file_read_at_all_ts.c.in \
+        file_read_at_ts.c.in \
+        file_read_ordered_begin_ts.c.in \
+        file_read_ordered_end_ts.c.in \
+        file_read_ordered_ts.c.in \
+        file_read_shared_ts.c.in \
+        file_read_ts.c.in \
+        file_write_all_begin_ts.c.in \
+        file_write_all_end_ts.c.in \
+        file_write_all_ts.c.in \
+        file_write_at_all_begin_ts.c.in \
+        file_write_at_all_end_ts.c.in \
+        file_write_at_all_ts.c.in \
+        file_write_at_ts.c.in \
+        file_write_ordered_begin_ts.c.in \
+        file_write_ordered_end_ts.c.in \
+        file_write_ordered_ts.c.in \
+        file_write_shared_ts.c.in \
+        file_write_ts.c.in \
+        free_mem_ts.c.in \
+	f_sync_reg_ts.c.in \
+        gather_init_ts.c.in \
+        gather_ts.c.in \
+        gatherv_init_ts.c.in \
+        gatherv_ts.c.in \
+        get_accumulate_ts.c.in \
+        get_address_ts.c.in \
+        get_count.c.in \
+        get_elements.c.in \
+        get_ts.c.in \
+        iallgather_ts.c.in \
+        iallgatherv_ts.c.in \
+        iallreduce_ts.c.in \
+        ialltoall_ts.c.in \
+        ialltoallv_ts.c.in \
+        ialltoallw_ts.c.in \
+        ibcast_ts.c.in \
+        ibsend_ts.c.in \
+        iexscan_ts.c.in \
+        igather_ts.c.in \
+        igatherv_ts.c.in \
+        imrecv_ts.c.in \
+        ineighbor_allgather_ts.c.in \
+        ineighbor_allgatherv_ts.c.in \
+        ineighbor_alltoall_ts.c.in \
+        ineighbor_alltoallv_ts.c.in \
+        ineighbor_alltoallw_ts.c.in \
+        irecv_ts.c.in \
+        ireduce_scatter_block_ts.c.in \
+        ireduce_scatter_ts.c.in \
+        ireduce_ts.c.in \
+        irsend_ts.c.in \
+        iscan_ts.c.in \
+        iscatter_ts.c.in \
+        iscatterv_ts.c.in \
+        isendrecv_replace_ts.c.in \
+        isendrecv_ts.c.in \
+        isend_ts.c.in \
+        issend_ts.c.in \
+        mrecv_ts.c.in \
+        neighbor_allgather_init_ts.c.in \
+        neighbor_allgather_ts.c.in \
+        neighbor_allgatherv_init_ts.c.in \
+        neighbor_allgatherv_ts.c.in \
+        neighbor_alltoall_init_ts.c.in \
+        neighbor_alltoall_ts.c.in \
+        neighbor_alltoallv_init_ts.c.in \
+        neighbor_alltoallv_ts.c.in \
+        neighbor_alltoallw_init_ts.c.in \
+        neighbor_alltoallw_ts.c.in \
+        pack_external_size.c.in \
+        pack_external_ts.c.in \
+        pack_size.c.in \
+        pack_ts.c.in \
+        precv_init_ts.c.in \
+        psend_init_ts.c.in \
+        put_ts.c.in \
+        raccumulate_ts.c.in \
+        recv_init_ts.c.in \
+        recv_ts.c.in \
+        reduce_init_ts.c.in \
+        reduce_local_ts.c.in \
+        reduce_scatter_block_init_ts.c.in \
+        reduce_scatter_block_ts.c.in \
+        reduce_scatter_init_ts.c.in \
+        reduce_scatter_ts.c.in \
+        reduce_ts.c.in \
+        rget_accumulate_ts.c.in \
+        rget_ts.c.in \
+        rput_ts.c.in \
+        rsend_init_ts.c.in \
+        rsend_ts.c.in \
+        scan_init_ts.c.in \
+        scan_ts.c.in \
+        scatter_init_ts.c.in \
+        scatter_ts.c.in \
+        scatterv_init_ts.c.in \
+        scatterv_ts.c.in \
+        send_init_ts.c.in \
+        sendrecv_replace_ts.c.in \
+        sendrecv_ts.c.in \
+        send_ts.c.in \
+        ssend_init_ts.c.in \
+        ssend_ts.c.in \
+        testany.c.in \
+        type_contiguous.c.in \
+        type_create_darray.c.in \
+        type_create_hindexed_block.c.in \
+        type_create_hindexed.c.in \
+        type_create_hvector.c.in \
+        type_create_indexed_block.c.in \
+        type_create_struct.c.in \
+        type_create_subarray.c.in \
+        type_get_true_extent.c.in \
+        type_indexed.c.in \
+        type_size.c.in \
+        type_vector.c.in \
+        unpack_external_ts.c.in \
+        unpack_ts.c.in \
+        waitall.c.in \
+        win_allocate.c.in \
+        win_allocate_shared.c.in \
+        win_attach_ts.c.in \
+        win_create_ts.c.in \
+        win_detach_ts.c.in \
+        win_shared_query.c.in
diff --git a/ompi/mpi/fortran/use-mpi-f08/base/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/base/Makefile.am
@@ -32,30 +32,34 @@ noinst_LTLIBRARIES = libusempif08_ccode.la
 
 libusempif08_ccode_la_SOURCES = \
         ts.h \
-        ts.c \
         bigcount.h \
         api_f08_generated.c \
 	ompi_type_get_extent_f_c.c \
 	ompi_type_get_envelope_f_c.c \
         ompi_type_get_contents_f_c.c
 
+if OMPI_FORTRAN_HAVE_TS
+libusempif08_ccode_la_SOURCES += \
+        ts.c
+endif
 #
 # api_f08_generated.c should work with all compilers, supporting CFI or TS 29113 support
 # through macros in ts.h and ts.c.
 #
 if OMPI_GENERATE_BINDINGS
 
 include ../Makefile.prototype_files
+template_files =${prototype_files:%=../%}
 
-api_f08_generated.c: $(prototype_files)
+api_f08_generated.c: $(template_files)
 	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
 	    --builddir $(abs_top_builddir) \
 	    --srcdir $(abs_top_srcdir) \
 	    --output $(abs_builddir)/$@ \
 	    fortran \
 	    code \
 	    --lang c \
-	    --prototype-files $(prototype_files)
+	    --prototype-files $(template_prototype_files)
 
 # Delete generated files on maintainer-clean
 MAINTAINERCLEANFILES = api_f08_generated.c
diff --git a/ompi/mpi/fortran/use-mpi-f08/base/ts.c b/ompi/mpi/fortran/use-mpi-f08/base/ts.c
@@ -14,8 +14,6 @@
 
 #include <assert.h>
 
-#if OMPI_FORTRAN_HAVE_TS
-
 int ompi_ts_create_datatype(CFI_cdesc_t *cdesc, int oldcount, MPI_Datatype oldtype, MPI_Datatype *newtype)
 {
     const int MAX_RANK = 15; /* Fortran 2008 specifies a maximum rank of 15 */
@@ -138,4 +136,3 @@ size_t ompi_ts_size(CFI_cdesc_t *cdesc) {
     }
     return res;
 }
-#endif /* OMPI_FORTRAN_HAVE_TS */
diff --git a/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@`
`14`	`14`
`15`	`15`	`#include <assert.h>`
`16`	`16`
`17`		`-#if OMPI_FORTRAN_HAVE_TS`
`18`		`-`
`19`	`17`	`int ompi_ts_create_datatype(CFI_cdesc_t cdesc, int oldcount, MPI_Datatype oldtype, MPI_Datatype newtype)`
`20`	`18`	`{`
`21`	`19`	`const int MAX_RANK = 15; /* Fortran 2008 specifies a maximum rank of 15 */`
`@@ -138,4 +136,3 @@ size_t ompi_ts_size(CFI_cdesc_t *cdesc) {`
`138`	`136`	`}`
`139`	`137`	`return res;`
`140`	`138`	`}`
`141`		`-#endif /* OMPI_FORTRAN_HAVE_TS */`