[cig-commits] [commit] QA: build: Fix scotch dependency of decompose_mesh.F90. (43a4244)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem3d

On branch  : QA
Link       : https://github.com/geodynamics/specfem3d/compare/6c327a1cde359cefa65f66e5b7981bfe995f92e3...4359ed56c14ef8f87387f46c8b705a1d395a40ba

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

commit 43a4244de97daebc2351beaa2f262c4076c46c7e
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Mon Jan 13 17:18:26 2014 -0500

    build: Fix scotch dependency of decompose_mesh.F90.
    
    Without this dependency, parallel builds fail due to missing scotchf.h.


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

43a4244de97daebc2351beaa2f262c4076c46c7e
 src/decompose_mesh/Makefile.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/decompose_mesh/Makefile.in b/src/decompose_mesh/Makefile.in
index 441daa0..2a0417c 100644
--- a/src/decompose_mesh/Makefile.in
+++ b/src/decompose_mesh/Makefile.in
@@ -103,7 +103,7 @@ DEC_OBJECTS = \
 @COND_PYRE_FALSE@	${FCLINK} -o  $E/xdecompose_mesh $(DEC_OBJECTS) $(SCOTCH_INC)  $(SCOTCH_LIBS)
 @COND_PYRE_FALSE@
 
-
+ at SCOTCH_INCLUDEDIR@/scotchf.h: xscotch
 xscotch:
 ifeq (@USE_BUNDLED_SCOTCH@,1)
 	echo "Using bundled Scotch"
@@ -112,10 +112,11 @@ else
 	echo "Not using bundled Scotch"
 endif
 
-
 clean:
 	rm -f $O/*.o *.mod  $E/xdecompose_mesh
 
+.PHONY: xscotch clean
+
 ####
 #### rule to build each .o file below
 ####
@@ -132,7 +133,7 @@ $O/part_decompose_mesh.o: part_decompose_mesh.f90
 $O/fault_scotch.o: fault_scotch.f90
 	${FCCOMPILE_CHECK} -c -o $O/fault_scotch.o fault_scotch.f90 $(SCOTCH_INC)
 
-$O/decompose_mesh.o: decompose_mesh.F90 part_decompose_mesh.f90 $O/part_decompose_mesh.o $O/fault_scotch.o
+$O/decompose_mesh.o: decompose_mesh.F90 $O/part_decompose_mesh.o $O/fault_scotch.o @SCOTCH_INCLUDEDIR@/scotchf.h
 	${FCCOMPILE_CHECK} -c -o $O/decompose_mesh.o decompose_mesh.F90 $(SCOTCH_INC)
 
 $O/program_decompose_mesh.o: program_decompose_mesh.f90 $O/part_decompose_mesh.o $O/decompose_mesh.o