[cig-commits] [commit] devel: build: Fix scotch header dependency. (129d6b0)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Thu May 1 00:51:07 PDT 2014


Repository : ssh://geoshell/specfem3d

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/cb32c88d6155d7974561a6f72fc17aea596e2c4d...50aa953c1db3f565d76415f5305410a529996b75

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

commit 129d6b00dc512a97624a9e24c1311aaf63b28c94
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Thu May 1 02:42:22 2014 -0400

    build: Fix scotch header dependency.
    
    This causes an extra build when everything should be up-to-date.


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

129d6b00dc512a97624a9e24c1311aaf63b28c94
 src/decompose_mesh/rules.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/decompose_mesh/rules.mk b/src/decompose_mesh/rules.mk
index ac40ae2..bf302f1 100644
--- a/src/decompose_mesh/rules.mk
+++ b/src/decompose_mesh/rules.mk
@@ -76,10 +76,10 @@ xdecompose_mesh: $E/xdecompose_mesh
 scotch: xscotch
 xscotch: $E/xscotch
 
-${SCOTCH_DIR}/scotchf.h: xscotch
+${SCOTCH_DIR}/include/scotchf.h: xscotch
 
 # rules for the pure Fortran version
-$E/xdecompose_mesh: ${SCOTCH_DIR}/scotchf.h $(decompose_mesh_SHARED_OBJECTS) $(decompose_mesh_OBJECTS)
+$E/xdecompose_mesh: ${SCOTCH_DIR}/include/scotchf.h $(decompose_mesh_SHARED_OBJECTS) $(decompose_mesh_OBJECTS)
 	${FCLINK} -o  $E/xdecompose_mesh $(decompose_mesh_SHARED_OBJECTS) $(decompose_mesh_OBJECTS) $(SCOTCH_LIBS)
 
 # scotch
@@ -99,7 +99,7 @@ endif
 ### Module dependencies
 ###
 
-$O/decompose_mesh.dec.o: $O/part_decompose_mesh.dec.o $O/fault_scotch.dec.o ${SCOTCH_DIR}/scotchf.h
+$O/decompose_mesh.dec.o: $O/part_decompose_mesh.dec.o $O/fault_scotch.dec.o ${SCOTCH_DIR}/include/scotchf.h
 $O/program_decompose_mesh.dec.o: $O/decompose_mesh.dec.o
 
 



More information about the CIG-COMMITS mailing list