[cig-commits] r22952 - in seismo/3D/SPECFEM3D_GLOBE/trunk/src: auxiliaries compute_optimized_dumping_undo_att create_header_file meshfem3D shared specfem3D
elliott.sales.de.andrade at geodynamics.org
elliott.sales.de.andrade at geodynamics.org
Tue Oct 8 00:18:04 PDT 2013
Author: elliott.sales.de.andrade
Date: 2013-10-08 00:18:03 -0700 (Tue, 08 Oct 2013)
New Revision: 22952
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
Log:
build: Update 'constants' dependencies.
* Nobody directly depends on constants.h except the one file that
creates the module.
* There were some specfem objects missing a dependency on the constants
module.
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/rules.mk 2013-10-08 07:17:57 UTC (rev 22951)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/rules.mk 2013-10-08 07:18:03 UTC (rev 22952)
@@ -122,10 +122,10 @@
##
## auxiliaries
##
-$O/%.aux.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
+$O/%.aux.o: $S/%.f90 $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.auxsolver.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o
+$O/%.auxsolver.o: $S/%.f90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/rules.mk 2013-10-08 07:17:57 UTC (rev 22951)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/compute_optimized_dumping_undo_att/rules.mk 2013-10-08 07:18:03 UTC (rev 22952)
@@ -81,6 +81,6 @@
#### rule for each .o file below
####
-$O/%.optdump.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
+$O/%.optdump.o: $S/%.f90 $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/rules.mk 2013-10-08 07:17:57 UTC (rev 22951)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/rules.mk 2013-10-08 07:18:03 UTC (rev 22952)
@@ -100,6 +100,6 @@
##
## rule for create_header_file
##
-$O/%.header.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
+$O/%.header.o: $S/%.f90 $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk 2013-10-08 07:17:57 UTC (rev 22951)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/rules.mk 2013-10-08 07:18:03 UTC (rev 22952)
@@ -246,32 +246,32 @@
#### rule for each .o file below
####
-$O/%.check_module.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
+$O/%.check_module.o: $S/%.f90 $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.check.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
+$O/%.check.o: $S/%.f90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.check.o: $S/%.F90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
+$O/%.check.o: $S/%.F90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.checkmpi.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
+$O/%.checkmpi.o: $S/%.f90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.checkmpi.o: $S/%.F90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
+$O/%.checkmpi.o: $S/%.F90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o
${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
## adios
-$O/%.check_adios_module.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o
+$O/%.check_adios_module.o: $S/%.f90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.check_adios_module.o: $S/%.F90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o
+$O/%.check_adios_module.o: $S/%.F90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.check_adios.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o $O/write_AVS_DX_global_data_adios.check_adios_module.o
+$O/%.check_adios.o: $S/%.f90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o $O/write_AVS_DX_global_data_adios.check_adios_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.check_adios.o: $S/%.F90 ${SETUP}/constants.h $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o $O/write_AVS_DX_global_data_adios.check_adios_module.o
+$O/%.check_adios.o: $S/%.F90 $O/shared_par.shared_module.o $O/meshfem3D_par.check_module.o $O/adios_helpers.shared_adios.o $O/write_AVS_DX_global_data_adios.check_adios_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk 2013-10-08 07:17:57 UTC (rev 22951)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk 2013-10-08 07:18:03 UTC (rev 22952)
@@ -119,24 +119,24 @@
$O/%.shared_module.o: $S/%.f90 ${SETUP}/constants.h
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.shared.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
+$O/%.shared.o: $S/%.f90 $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.shared.o: $S/%.F90 ${SETUP}/constants.h $O/shared_par.shared_module.o
+$O/%.shared.o: $S/%.F90 $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.sharedmpi.o: $S/%.f90 ${SETUP}/constants.h $O/shared_par.shared_module.o
+$O/%.sharedmpi.o: $S/%.f90 $O/shared_par.shared_module.o
${MPIFCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
## adios
-$O/%.shared_adios_module.o: $S/%.f90 ${SETUP}/constants.h
+$O/%.shared_adios_module.o: $S/%.f90
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.shared_adios.o: $S/%.f90 ${SETUP}/constants.h $O/adios_helpers_writers.shared_adios_module.o $O/adios_helpers_definitions.shared_adios_module.o
+$O/%.shared_adios.o: $S/%.f90 $O/adios_helpers_writers.shared_adios_module.o $O/adios_helpers_definitions.shared_adios_module.o $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.shared_adios.o: $S/%.F90 ${SETUP}/constants.h $O/adios_helpers_writers.shared_adios_module.o $O/adios_helpers_definitions.shared_adios_module.o
+$O/%.shared_adios.o: $S/%.F90 $O/adios_helpers_writers.shared_adios_module.o $O/adios_helpers_definitions.shared_adios_module.o $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk 2013-10-08 07:17:57 UTC (rev 22951)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk 2013-10-08 07:18:03 UTC (rev 22952)
@@ -306,34 +306,34 @@
###
### specfem3D - optimized flags and dependence on values from mesher here
###
-$O/%.solverstatic_module.o: $S/%.F90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o
+$O/%.solverstatic_module.o: $S/%.F90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.solverstatic.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o
+$O/%.solverstatic.o: $S/%.f90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.solverstatic.o: $S/%.F90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o
+$O/%.solverstatic.o: $S/%.F90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.solverstatic_openmp.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o
+$O/%.solverstatic_openmp.o: $S/%.f90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o
## DK DK add OpenMP compiler flag here if needed
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -qsmp=omp -o $@ $<
-$O/%.solverstatic_adios.o: $S/%.f90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o $O/adios_helpers.shared_adios.o
+$O/%.solverstatic_adios.o: $S/%.f90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o $O/adios_helpers.shared_adios.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.solverstatic_adios.o: $S/%.F90 ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o $O/adios_helpers.shared_adios.o
+$O/%.solverstatic_adios.o: $S/%.F90 ${OUTPUT}/values_from_mesher.h $O/shared_par.shared_module.o $O/specfem3D_par.solverstatic_module.o $O/adios_helpers.shared_adios.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
###
### no dependence on values from mesher here
###
-$O/%.solver.o: $S/%.f90 ${SETUP}/constants.h
+$O/%.solver.o: $S/%.f90 $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
-$O/%.solver.o: $S/%.F90 ${SETUP}/constants.h
+$O/%.solver.o: $S/%.F90 $O/shared_par.shared_module.o
${FCCOMPILE_CHECK} ${FCFLAGS_f90} -c -o $@ $<
More information about the CIG-COMMITS
mailing list