Переглянути джерело

Fix make dist on boxes without fortran

Samuel Thibault 5 роки тому
батько
коміт
ceb3e2e445
3 змінених файлів з 12 додано та 13 видалено
  1. 7 9
      examples/Makefile.am
  2. 3 3
      mpi/examples/Makefile.am
  3. 2 1
      tests/Makefile.am

+ 7 - 9
examples/Makefile.am

@@ -1113,13 +1113,16 @@ sched_ctx_parallel_tasks_reuse_handle_CFLAGS = \
 
 endif
 
-if STARPU_HAVE_FC
-# Fortran90 example
-
 # - link over source file to build our own object
 fortran90/starpu_mod.f90:
 	@$(MKDIR_P) $(dir $@)
 	$(LN_S) $(srcdir)/../../include/$(notdir $@) $@
+native_fortran/fstarpu_mod.f90:
+	@$(MKDIR_P) $(dir $@)
+	$(LN_S) $(srcdir)/../../include/$(notdir $@) $@
+
+if STARPU_HAVE_FC
+# Fortran90 example
 
 # - express the creation of .mod along .o
 starpu_mod.mod: fortran90/starpu_mod.o
@@ -1134,13 +1137,8 @@ fortran90/f90_example.o: mod_types.mod mod_interface.mod mod_compute.mod starpu_
 
 # Native Fortran example
 
-# - link over source file to build our own object
-native_fortran/fstarpu_mod.f90:
-	@$(MKDIR_P) $(dir $@)
-	$(LN_S) $(srcdir)/../../include/$(notdir $@) $@
-fstarpu_mod.mod: native_fortran/fstarpu_mod.o
-
 # - express the creation of .mod along .o
+fstarpu_mod.mod: native_fortran/fstarpu_mod.o
 nf_codelets.mod: native_fortran/nf_codelets.o
 nf_compute.mod: native_fortran/nf_compute.o
 nf_dynbuf_cl.mod: native_fortran/nf_dynbuf_cl.o

+ 3 - 3
mpi/examples/Makefile.am

@@ -384,9 +384,6 @@ starpu_mpi_EXAMPLES	+=			\
 endif
 endif
 
-if STARPU_HAVE_MPIFORT
-if BUILD_EXAMPLES
-if !STARPU_SANITIZE
 # Native Fortran example
 
 # - link over source file to build our own object
@@ -397,6 +394,9 @@ native_fortran/fstarpu_mpi_mod.f90:
 	@$(MKDIR_P) $(dir $@)
 	$(LN_S) $(srcdir)/../../../mpi/include/$(notdir $@) $@
 
+if STARPU_HAVE_MPIFORT
+if BUILD_EXAMPLES
+if !STARPU_SANITIZE
 # - express the creation of .mod along .o
 fstarpu_mod.mod: native_fortran/fstarpu_mod.o
 fstarpu_mpi_mod.mod: native_fortran/fstarpu_mpi_mod.o

+ 2 - 1
tests/Makefile.am

@@ -1000,13 +1000,14 @@ perfmodels_feed_SOURCES=\
 
 sched_policies_execute_all_tasks_LDFLAGS = $(AM_LDFLAGS) -lm
 
-if STARPU_HAVE_FC
 # Fortran90 tests
+
 # - link over source file to build our own object
 fortran90/starpu_mod.f90:
 	@$(MKDIR_P) $(dir $@)
 	$(LN_S) $(srcdir)/../../include/$(notdir $@) $@
 
+if STARPU_HAVE_FC
 # - express the creation of .mod along .o
 starpu_mod.mod: fortran90/starpu_mod.o