[cig-commits] [commit] master: makemake.pl ignores include in .f90 files (c1b8fda)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/axisem

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/5406393c6d68c31d85ff7c409fd334d40e5a0841...4dd1b3a956953c6b78c14f54de0cf0f9a6479485

>---------------------------------------------------------------

commit c1b8fdab92d9178f273b5d4dd58922d74faad291
Author: Simon Stähler <staehler at geophysik.uni-muenchen.de>
Date:   Fri Oct 17 14:34:43 2014 +0200

    makemake.pl ignores include in .f90 files
    
     - To avoid an entry for mpif.h
     - In case somebody wants to use a 'include' in this Fortran2003 code, please mail me


>---------------------------------------------------------------

c1b8fdab92d9178f273b5d4dd58922d74faad291
 SOLVER/Makefile.TEMPLATE | 5 ++++-
 SOLVER/makemake.pl       | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/SOLVER/Makefile.TEMPLATE b/SOLVER/Makefile.TEMPLATE
index 9951881..af8fb4d 100644
--- a/SOLVER/Makefile.TEMPLATE
+++ b/SOLVER/Makefile.TEMPLATE
@@ -45,6 +45,9 @@ ifeq ($(strip $(SERIAL)),true)
     FFLAGS += -Dserial
     LDFLAGS += -pthread
 endif
+ifeq ($(strip $(INCLUDE_MPI)),true)
+    FFLAGS += -Dinclude_mpi
+endif
 
 
 # cancel m2c implicit rule 
@@ -143,7 +146,7 @@ lateral_heterogeneities.o: background_models.o commun.o data_heterogeneous.o \
 meshes_io.o: data_io.o data_matr.o data_mesh.o data_pointwise.o data_proc.o \
 	data_source.o data_spec.o global_parameters.o nc_routines.o utlity.o Makefile ../make_axisem.macros 
 nc_routines.o: clocks.o commun.o data_io.o data_mesh.o data_proc.o \
-	data_source.o data_time.o global_parameters.o Makefile ../make_axisem.macros 
+	data_source.o data_spec.o data_time.o global_parameters.o Makefile ../make_axisem.macros 
 parameters.o: attenuation.o commun.o data_comm.o data_io.o data_mesh.o \
 	data_proc.o data_source.o data_time.o global_parameters.o \
 	nc_routines.o utlity.o Makefile ../make_axisem.macros 
diff --git a/SOLVER/makemake.pl b/SOLVER/makemake.pl
index 86db3a0..feaebbc 100755
--- a/SOLVER/makemake.pl
+++ b/SOLVER/makemake.pl
@@ -76,6 +76,10 @@ print MAKEFILE "    FFLAGS += -Dserial\n";
 print MAKEFILE "    LDFLAGS += -pthread\n";
 print MAKEFILE "endif\n";
 
+print MAKEFILE "ifeq (\$(strip \$(INCLUDE_MPI)),true)\n";
+print MAKEFILE "    FFLAGS += -Dinclude_mpi\n";
+print MAKEFILE "endif\n";
+
 print MAKEFILE "\n\n";
 print MAKEFILE "# cancel m2c implicit rule \n";
 print MAKEFILE "%.o : %.mod \n ";
@@ -117,6 +121,7 @@ print MAKEFILE "\t\$(FC) \$(FFLAGS) -c \$(INCLUDE) \$<\n\n";
 # Dependency listings
 #
 &MakeDependsf90($ARGV[1]);
+
 &MakeDepends("*.f *.F", '^\s*include\s+["\']([^"\']+)["\']');
 &MakeDepends("*.c",     '^\s*#\s*include\s+["\']([^"\']+)["\']');
 
@@ -252,7 +257,7 @@ sub MakeDependsf90 {
    foreach $file (<*.f90 *.F90>) {
       open(FILE, $file);
       while (<FILE>) {
-         /^\s*include\s+["\']([^"\']+)["\']/i && push(@incs,$1);
+        #/^\s*include\s+["\']([^"\']+)["\']/i && push(@incs,$1);
          /^\s*use\s+([^\s,!]+)/i && push(@modules, &toLower($1));
          }
       ($objfile = $file) =~ s/\.(f|F)90$/.o/;