f08: misc Makefile fixes

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

@@ -1,6 +1,8 @@
 # -*- makefile -*-
 #
 # Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 #
 # $COPYRIGHT$
 #
@@ -60,7 +62,15 @@ mpi-f08-types.lo: mpi-f08-types.f90
 mpi-f08-interfaces.lo: mpi-f08-interfaces.F90 mpi-f08-types.lo
 OMPI_Fortran_binding.lo: OMPI_Fortran_binding.f90 mpi-f08-types.lo
 
-$(mpi_api_files): mpi-f08.lo
+
+#
+# Automake doesn't do Fortran dependency analysis, so must list them
+# manually here.  Bummer!
+#
+
+mpi_api_lo_files = $(mpi_api_files:.f90=.lo)
+ 
+$(mpi_api_lo_files): mpi-f08.lo
 
 mpi-f08.lo: mpi-f08-types.lo
 mpi-f08.lo: OMPI_Fortran_binding.lo

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

@@ -105,7 +105,6 @@ mpi_api_files = \
         bcast_f08.F90 \
         bsend_f08.F90 \
         bsend_init_f08.F90 \
-        buffer_detach.c \
         buffer_attach_f08.F90 \
         buffer_detach_f08.F90 \
         cancel_f08.F90 \
@@ -806,6 +805,7 @@ libmpi_usempif08_la_SOURCES = \
         mpi-f08.F90 \
         mpi-f-interfaces-bind.h pmpi-f-interfaces-bind.h \
         attr-fn-f08-callback-interfaces.h \
+        buffer_detach.c \
         conversion-fn-null-f08-interface.h \
         constants.h \
         constants.c