[cig-commits] [commit] QA: build: Fix dependency of part_unstruct.f90 on scotch. (310d70b)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem2d

On branch  : QA
Link       : https://github.com/geodynamics/specfem2d/compare/28743f19b9f9fdb75d359c135053825c0ffd05b3...5e8aa55e68fd17b6f475fb65531b84195e497aa1

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

commit 310d70bea0831a54950827ea14538ba648a008a0
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Tue Jan 7 20:05:51 2014 -0500

    build: Fix dependency of part_unstruct.f90 on scotch.
    
    Without this dependency, parallel builds fail due to missing scotchf.h.


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

310d70bea0831a54950827ea14538ba648a008a0
 src/meshfem2D/Makefile.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/meshfem2D/Makefile.in b/src/meshfem2D/Makefile.in
index 847ee87..3c34c6c 100644
--- a/src/meshfem2D/Makefile.in
+++ b/src/meshfem2D/Makefile.in
@@ -107,7 +107,7 @@ OBJS_MESHFEM2D = \
 	$O/spline_routines.o \
 	$O/meshfem2D.o
 
-default: scotch_library $(DEFAULT)
+default: $(DEFAULT)
 
 all: default
 
@@ -115,7 +115,7 @@ mesh : meshfem2D
 meshfem2D: xmeshfem2D
 check_quality_external_mesh: xcheck_quality_external_mesh
 
-
+ at SCOTCH_INCLUDEDIR@/scotchf.h: scotch_library
 scotch_library:
 ifeq (@USE_BUNDLED_SCOTCH@,1)
 	echo "Using bundled Scotch"
@@ -171,7 +171,8 @@ $O/get_node_number.o: ${S}/get_node_number.f90
 $O/meshfem2D.o: ${S}/meshfem2D.F90 $O/part_unstruct.o $O/read_interfaces_file.o $O/read_parameter_file.o $O/read_source_file.o ${SETUP}/constants.h
 	${F90} $(FLAGS_CHECK) -c -o $O/meshfem2D.o ${S}/meshfem2D.F90
 
-$O/part_unstruct.o: ${S}/part_unstruct.F90 ${SETUP}/constants.h
+ at COND_MPI_TRUE@$O/part_unstruct.o: ${S}/part_unstruct.F90 ${SETUP}/constants.h @SCOTCH_INCLUDEDIR@/scotchf.h
+ at COND_MPI_FALSE@$O/part_unstruct.o: ${S}/part_unstruct.F90 ${SETUP}/constants.h
 	${F90} $(FLAGS_CHECK) -c -o $O/part_unstruct.o ${S}/part_unstruct.F90
 
 $O/read_interfaces_file.o: ${S}/read_interfaces_file.f90 ${SETUP}/constants.h