[cig-commits] [commit] QA: build: Remove forced re-compilation. (7520567)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Jan 17 04:27:48 PST 2014
Repository : ssh://geoshell/specfem3d
On branch : QA
Link : https://github.com/geodynamics/specfem3d/compare/6c327a1cde359cefa65f66e5b7981bfe995f92e3...4359ed56c14ef8f87387f46c8b705a1d395a40ba
>---------------------------------------------------------------
commit 7520567a6af67d2653e8d69c7cccbcb1973cd400
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat Jan 11 18:54:21 2014 -0500
build: Remove forced re-compilation.
>---------------------------------------------------------------
7520567a6af67d2653e8d69c7cccbcb1973cd400
src/generate_databases/Makefile.in | 10 ++++------
src/meshfem3D/Makefile.in | 10 ++++------
src/specfem3D/Makefile.in | 9 +++------
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/src/generate_databases/Makefile.in b/src/generate_databases/Makefile.in
index e87fe2e..bc96a7b 100644
--- a/src/generate_databases/Makefile.in
+++ b/src/generate_databases/Makefile.in
@@ -232,17 +232,15 @@ $O/%.noadios.o: %.F90
$O/%.noadios.o: %.f90
${FC} -c -o $@ $<
-$O/%.shared_noadios.o: ${SHARED}/%.f90 .FORCE
+$O/%.shared_noadios.o: ${SHARED}/%.f90
${FC} -c -o $@ $<
-$O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h .FORCE
+$O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h
${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
-$O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h .FORCE
+$O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h
${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
-.FORCE:
-
#######################################
###
@@ -252,7 +250,7 @@ $O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h .FORCE
$O/%.o: %.f90 $(SHARED)constants.h
${FCCOMPILE_CHECK} -c -o $@ $<
-$O/%.shared.o: $(SHARED)%.f90 $(SHARED)constants.h .FORCE
+$O/%.shared.o: $(SHARED)%.f90 $(SHARED)constants.h
${FCCOMPILE_CHECK} -c -o $@ $<
###
diff --git a/src/meshfem3D/Makefile.in b/src/meshfem3D/Makefile.in
index 71b2f2e..88a57a6 100644
--- a/src/meshfem3D/Makefile.in
+++ b/src/meshfem3D/Makefile.in
@@ -207,23 +207,21 @@ $O/%.noadios.o: %.F90
$O/%.noadios.o: %.f90
${FC} -c -o $@ $<
-$O/%.shared_noadios.o: ${SHARED}/%.f90 .FORCE
+$O/%.shared_noadios.o: ${SHARED}/%.f90
${FC} -c -o $@ $<
-$O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h .FORCE
+$O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h
${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
-$O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h .FORCE
+$O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h
${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
-.FORCE:
-
#######################################
###
### not optimized flags (not dependent on values from mesher anymore)
###
-$O/%.shared.o: $(SHARED)%.f90 $(SHARED)constants.h .FORCE
+$O/%.shared.o: $(SHARED)%.f90 $(SHARED)constants.h
${FCCOMPILE_CHECK} -c -o $@ $<
###
diff --git a/src/specfem3D/Makefile.in b/src/specfem3D/Makefile.in
index d5dcb12..b1767f5 100644
--- a/src/specfem3D/Makefile.in
+++ b/src/specfem3D/Makefile.in
@@ -452,18 +452,15 @@ $O/%.noadios.o: %.F90
$O/%.noadios.o: %.f90
${FC} -c -o $@ $<
-$O/%.shared_noadios.o: ${SHARED}/%.f90 .FORCE
+$O/%.shared_noadios.o: ${SHARED}/%.f90
${FC} -c -o $@ $<
-$O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h .FORCE
+$O/%.shared_adios.o: ${SHARED}/%.f90 ${SHARED}/constants.h
${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
-$O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h .FORCE
+$O/%.shared_adios.o: ${SHARED}/%.F90 ${SHARED}/constants.h
${MPIFC} -c $(ADIOS_INC) $(FCFLAGS) $(MPI_INCLUDES) -o $@ $<
-# Force adios helpers to be recompiled.
-.FORCE:
-
#######################################
$O/%.o: %.f90 $(SHARED)constants.h
${FCCOMPILE_CHECK} -c -o $@ $<
More information about the CIG-COMMITS
mailing list