Update script invocations with prototype files

Signed-off-by: Jake Tronge <jtronge@lanl.gov>

Author: jtronge

config/ompi_config_files.m4

@@ -42,10 +42,8 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
         ompi/mpi/fortran/use-mpi-f08/Makefile
         ompi/mpi/fortran/use-mpi-f08/base/Makefile
         ompi/mpi/fortran/use-mpi-f08/bindings/Makefile
-        ompi/mpi/fortran/use-mpi-f08/ts/Makefile
         ompi/mpi/fortran/use-mpi-f08/mod/Makefile
         ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.h
-        ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-rename.h
         ompi/mpi/fortran/mpiext-use-mpi/Makefile
         ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile
         ompi/mpi/bindings/ompi_bindings/compiler.py

ompi/Makefile.am

@@ -88,7 +88,6 @@ SUBDIRS = \
         mpi/fortran/use-mpi-f08/base \
         mpi/fortran/use-mpi-f08/mod \
         mpi/fortran/use-mpi-f08/bindings \
-        mpi/fortran/use-mpi-f08/ts \
         $(OMPI_MPIEXT_USEMPIF08_DIRS) \
         mpi/fortran/use-mpi-f08 \
         mpi/fortran/mpiext-use-mpi-f08 \

ompi/mpi/fortran/use-mpi-f08/Makefile.am

@@ -583,115 +583,17 @@ EXTRA_DIST = interface.json
 
 if OMPI_GENERATE_BINDINGS
 
-prototype_files = \
-        accumulate_ts.c.in \
-        bsend_init_ts.c.in \
-        bsend_ts.c.in \
-        buffer_attach_ts.c.in \
-        compare_and_swap_ts.c.in \
-        f_sync_reg_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 \
-        get_accumulate_ts.c.in \
-        get_address_ts.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 \
-        isend_ts.c.in \
-        isendrecv_replace_ts.c.in \
-        isendrecv_ts.c.in \
-        issend_ts.c.in \
-        mrecv_ts.c.in \
-        pack_external_ts.c.in \
-        pack_ts.c.in \
-        put_ts.c.in \
-        raccumulate_ts.c.in \
-        recv_init_ts.c.in \
-        recv_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 \
-        send_init_ts.c.in \
-        send_ts.c.in \
-        sendrecv_replace_ts.c.in \
-        sendrecv_ts.c.in \
-        ssend_init_ts.c.in \
-        ssend_ts.c.in \
-        ts.c.in \
-        unpack_external_ts.c.in \
-        unpack_ts.c.in \
-        win_attach_ts.c.in \
-        win_create_ts.c.in \
-        win_detach_ts.c.in
-
-api_f08_generated.F90: interface.json
+include Makefile.prototype_files
+
+api_f08_generated.F90: $(prototype_files)
 	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
 	    --builddir $(abs_top_builddir) \
 	    --srcdir $(abs_top_srcdir) \
 	    --output $(abs_builddir)/$@ \
 	    fortran \
-	    --prototypes $(abs_srcdir)/$< \
 	    code \
-	    fortran
+	    fortran \
+	    $(prototype_files)
 
 # Delete generated file on maintainer-clean
 MAINTAINERCLEANFILES = api_f08_generated.F90

ompi/mpi/fortran/use-mpi-f08/Makefile.prototype_files

@@ -0,0 +1,100 @@
+
+prototype_files = \
+        accumulate_ts.c.in \
+        bsend_init_ts.c.in \
+        bsend_ts.c.in \
+        buffer_attach_ts.c.in \
+        compare_and_swap_ts.c.in \
+        f_sync_reg_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 \
+        get_accumulate_ts.c.in \
+        get_address_ts.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 \
+        isend_ts.c.in \
+        isendrecv_replace_ts.c.in \
+        isendrecv_ts.c.in \
+        issend_ts.c.in \
+        mrecv_ts.c.in \
+        pack_external_ts.c.in \
+        pack_ts.c.in \
+        put_ts.c.in \
+        raccumulate_ts.c.in \
+        recv_init_ts.c.in \
+        recv_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 \
+        send_init_ts.c.in \
+        send_ts.c.in \
+        sendrecv_replace_ts.c.in \
+        sendrecv_ts.c.in \
+        ssend_init_ts.c.in \
+        ssend_ts.c.in \
+        ts.c.in \
+        unpack_external_ts.c.in \
+        unpack_ts.c.in \
+        win_attach_ts.c.in \
+        win_create_ts.c.in \
+        win_detach_ts.c.in

ompi/mpi/fortran/use-mpi-f08/base/Makefile.am

@@ -49,15 +49,20 @@ endif
 # binding scripts in order to generate the specific version for their compiler.
 #
 if OMPI_GENERATE_BINDINGS
-api_f08_generated.c: ../interface.json
+
+include ../Makefile.prototype_files
+prototype_files = $(prototype_files:%=../%)
+
+api_f08_generated.c: $(prototype_files)
 	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
 	    --builddir $(abs_top_builddir) \
 	    --srcdir $(abs_top_srcdir) \
 	    --output $(abs_builddir)/$@ \
 	    fortran \
 	    --prototypes $(abs_srcdir)/$< \
 	    code \
-	    c
+	    c \
+	    $(prototype_files)
 
 api_f08_ts_generated.c: ../interface.json
 	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \

ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am

@@ -78,14 +78,19 @@ config_h = \
 
 # Generate the Fortran interfaces
 if OMPI_GENERATE_BINDINGS
-mpi-f08-interfaces-generated.h: ../interface.json
+
+include ../Makefile.prototype_files
+prototype_files_mod = $(prototype_files:%=../%)
+
+mpi-f08-interfaces-generated.h: $(prototype_files_mod)
 	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
 	    --builddir $(abs_top_builddir) \
 	    --srcdir $(abs_top_srcdir) \
 	    --output $(abs_builddir)/$@ \
 	    fortran \
 	    --prototypes $(abs_srcdir)/$< \
-	    interface
+	    interface \
+	    $(prototype_files_mod)
 
 # Delete generated file on maintainer-clean
 MAINTAINERCLEANFILES = mpi-f08-interfaces-generated.h