- enable building more native Fortran examples

- rename modules for nf_example

examples/Makefile.am

@@ -230,7 +230,8 @@ if !STARPU_SANITIZE
 STARPU_EXAMPLES +=				\
 	fortran90/f90_example			\
 	native_fortran/nf_vector	\
-	native_fortran/nf_matrix
+	native_fortran/nf_matrix	\
+	native_fortran/nf_example
 endif
 endif
 endif
@@ -359,6 +360,12 @@ native_fortran_nf_matrix_SOURCES =	\
 	native_fortran/nf_codelets.f90		\
 	$(top_srcdir)/include/fstarpu_mod.f90	\
 	native_fortran/nf_matrix.f90
+
+native_fortran_nf_example_SOURCES =	\
+	native_fortran/nf_types.f90		\
+	native_fortran/nf_compute.f90		\
+	$(top_srcdir)/include/fstarpu_mod.f90	\
+	native_fortran/nf_example.f90
 endif
 
 #######################
@@ -988,6 +995,8 @@ f90_example.o: $(top_srcdir)/examples/fortran90/f90_example.f90 $(top_srcdir)/ex
 # - list explicit dependences to control proper module files generation
 # - the overriding rule fully disables the corresponing default rule, thus
 #   the default rule body must be copied entirely
+nf_types.mod: nf_types.o
+nf_compute.mod: nf_compute.o
 fstarpu_mod.mod: fstarpu_mod.o
 nf_codelets.mod: nf_codelets.o
 
@@ -1000,6 +1009,13 @@ nf_codelets.o: $(top_srcdir)/examples/native_fortran/nf_codelets.f90 fstarpu_mod
 nf_vector.o: $(top_srcdir)/examples/native_fortran/nf_vector.f90 nf_codelets.mod fstarpu_mod.mod
 	$(AM_V_FC)$(FC) $(native_fortran_nf_vector_FCFLAGS) $(FCFLAGS) -c -o $@ `test -f 'native_fortran/nf_vector.f90' || echo '$(srcdir)/'`native_fortran/nf_vector.f90
 
-matrix.o: $(top_srcdir)/examples/native_fortran/nf_matrix.f90 nf_codelets.mod fstarpu_mod.mod
-	$(AM_V_FC)$(FC) $(native_fortran_matrix_FCFLAGS) $(FCFLAGS) -c -o $@ `test -f 'native_fortran/nf_matrix.f90' || echo '$(srcdir)/'`native_fortran/nf_matrix.f90
+nf_matrix.o: $(top_srcdir)/examples/native_fortran/nf_matrix.f90 nf_codelets.mod fstarpu_mod.mod
+	$(AM_V_FC)$(FC) $(native_fortran_nf_matrix_FCFLAGS) $(FCFLAGS) -c -o $@ `test -f 'native_fortran/nf_matrix.f90' || echo '$(srcdir)/'`native_fortran/nf_matrix.f90
+
+nf_compute.o: $(top_srcdir)/examples/native_fortran/nf_compute.f90 nf_types.mod fstarpu_mod.mod
+	$(AM_V_FC)$(FC) $(native_fortran_nf_example_FCFLAGS) $(FCFLAGS) -c -o $@ `test -f 'native_fortran/nf_compute.f90' || echo '$(srcdir)/'`native_fortran/nf_compute.f90
+
+nf_example.o: $(top_srcdir)/examples/native_fortran/nf_example.f90 nf_types.mod nf_compute.mod fstarpu_mod.mod
+	$(AM_V_FC)$(FC) $(native_fortran_nf_example_FCFLAGS) $(FCFLAGS) -c -o $@ `test -f 'native_fortran/nf_example.f90' || echo '$(srcdir)/'`native_fortran/nf_example.f90
+
 endif

examples/native_fortran/Makefile.nf_example

@@ -18,8 +18,8 @@ PROG = nf_example
 
 FSTARPU_MOD = $(shell pkg-config --cflags-only-I starpu-1.3|sed -e 's/^\([^ ]*starpu\/1.3\).*$$/\1/;s/^.* //;s/^-I//')/fstarpu_mod.f90
 
-SRCSF = mod_types.f90		\
-	mod_compute.f90		\
+SRCSF = nf_types.f90		\
+	nf_compute.f90		\
 	nf_example.f90
 
 FC = gfortran
@@ -45,5 +45,5 @@ clean:
 	rm -fv *.o *.mod $(PROG)
 
 # modfiles generation dependences
-mod_compute.o: mod_compute.f90 mod_types.o fstarpu_mod.o
-nf_example.o: nf_example.f90 mod_types.o mod_compute.o fstarpu_mod.o
+nf_compute.o: nf_compute.f90 nf_types.o fstarpu_mod.o
+nf_example.o: nf_example.f90 nf_types.o nf_compute.o fstarpu_mod.o

examples/native_fortran/mod_compute.f90

@@ -16,9 +16,9 @@
 
 ! Computation kernels for the simulation
 
-MODULE mod_compute
+MODULE nf_compute
 
-  USE mod_types
+  USE nf_types
   USE fstarpu_mod
   USE iso_c_binding
 
@@ -129,4 +129,4 @@ CONTAINS
 
   END SUBROUTINE copy_element_cpu
 
-END MODULE mod_compute
+END MODULE nf_compute

examples/native_fortran/nf_example.f90

@@ -20,9 +20,9 @@
 
 PROGRAM f90_example
 
-  USE mod_types
+  USE nf_types
   USE fstarpu_mod
-  USE mod_compute
+  USE nf_compute
   USE iso_c_binding
 
   IMPLICIT NONE

examples/native_fortran/mod_types.f90

@@ -14,7 +14,7 @@
 !
 ! See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
-MODULE mod_types
+MODULE nf_types
 
   USE iso_c_binding
 
@@ -34,4 +34,4 @@ MODULE mod_types
      TYPE(type_mesh_elt), POINTER, DIMENSION(:) :: elt
   END TYPE type_mesh
 
-END MODULE mod_types
+END MODULE nf_types