[cig-commits] [commit] QA: build: Fix rules for executables. (6411e8c)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem2d

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

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

commit 6411e8c090228498a29260c07213b749aed50627
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Mon Jan 6 01:23:47 2014 -0500

    build: Fix rules for executables.
    
    Since the exectuables were never mentioned by full path, they would be
    rebuilt unconditionally.


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

6411e8c090228498a29260c07213b749aed50627
 src/meshfem2D/Makefile.in | 12 +++++++-----
 src/specfem2D/Makefile.in | 15 +++++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/meshfem2D/Makefile.in b/src/meshfem2D/Makefile.in
index bbdac71..a5eb9ec 100644
--- a/src/meshfem2D/Makefile.in
+++ b/src/meshfem2D/Makefile.in
@@ -126,10 +126,10 @@ endif
 
 
 clean:
-	(rm -rf $O/*.o $E/xmeshfem2D $E/xmeshfem2D.trace \
-	$O/*.il *.mod core \
+	-rm -rf $O/*.o $E/xmeshfem2D \
+	$O/*.il *.mod \
 	$E/xcheck_quality_external_mesh \
-	*.oo *.ipo)
+	*.oo *.ipo
 
 
 help:
@@ -143,13 +143,15 @@ help:
 ##
 ## mesher
 ##
-xmeshfem2D: $(OBJS_MESHFEM2D)
+xmeshfem2D: $E/xmeshfem2D
+$E/xmeshfem2D: $(OBJS_MESHFEM2D)
 	$(LINK) $(FLAGS_CHECK) -o ${E}/xmeshfem2D $(OBJS_MESHFEM2D) $(LIB)
 
 ##
 ## check_quality_external_mesh
 ##
-xcheck_quality_external_mesh: $O/check_quality_external_mesh.o $O/read_value_parameters.o $O/param_reader.o $O/define_shape_functions.o
+xcheck_quality_external_mesh: $E/xcheck_quality_external_mesh
+$E/xcheck_quality_external_mesh: $O/check_quality_external_mesh.o $O/read_value_parameters.o $O/param_reader.o $O/define_shape_functions.o
 	${F90} $(FLAGS_CHECK) -o ${E}/xcheck_quality_external_mesh $O/check_quality_external_mesh.o $O/read_value_parameters.o $O/param_reader.o $O/define_shape_functions.o
 
 $O/define_shape_functions.o: ${S}/../specfem2D/define_shape_functions.f90 ${SETUP}/constants.h
diff --git a/src/specfem2D/Makefile.in b/src/specfem2D/Makefile.in
index 1177adc..eeaadd7 100644
--- a/src/specfem2D/Makefile.in
+++ b/src/specfem2D/Makefile.in
@@ -183,10 +183,10 @@ convolve_source_timefunction: xconvolve_source_timefunction
 
 
 clean:
-	(rm -rf $O/*.o $E/xspecfem2D $E/xspecfem2D.trace \
-	$O/*.o $O/*.il *.mod core \
+	-rm -rf $O/*.o $E/xspecfem2D \
+	$O/*.o $O/*.il *.mod \
 	$E/xconvolve_source_timefunction \
-	*.oo *.ipo)
+	*.oo *.ipo
 
 
 help:
@@ -202,19 +202,22 @@ help:
 ##
 ## solver
 ##
-xspecfem2D: $(OBJS_SPECFEM2D)
+xspecfem2D: $E/xspecfem2D
+$E/xspecfem2D: $(OBJS_SPECFEM2D)
 	$(LINK) $(FLAGS_CHECK) -o ${E}/xspecfem2D $(OBJS_SPECFEM2D)
 
 ##
 ## convolve_source_timefunction
 ##
-xconvolve_source_timefunction: $O/convolve_source_timefunction.o
+xconvolve_source_timefunction: $E/xconvolve_source_timefunction
+$E/xconvolve_source_timefunction: $O/convolve_source_timefunction.o
 	${F90} $(FLAGS_CHECK) -o ${E}/xconvolve_source_timefunction $O/convolve_source_timefunction.o
 
 ##
 ## adj_seismogram
 ##
-xadj_seismogram: $O/adj_seismogram.o
+xadj_seismogram: $E/xadj_seismogram
+$E/xadj_seismogram: $O/adj_seismogram.o
 	${F90} $(FLAGS_CHECK) -o ${E}/xadj_seismogram $O/adj_seismogram.o