[cig-commits] [commit] QA: build: Fix rules for executables. (d5039a3)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Jan 17 04:27:52 PST 2014
Repository : ssh://geoshell/specfem3d
On branch : QA
Link : https://github.com/geodynamics/specfem3d/compare/6c327a1cde359cefa65f66e5b7981bfe995f92e3...4359ed56c14ef8f87387f46c8b705a1d395a40ba
>---------------------------------------------------------------
commit d5039a3dac5f3cd411488f41c00e0e0d4c8f1a32
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat Jan 11 19:58:22 2014 -0500
build: Fix rules for executables.
Since the executables were never mentioned by full path, they would be
rebuilt unconditionally.
>---------------------------------------------------------------
d5039a3dac5f3cd411488f41c00e0e0d4c8f1a32
src/check_mesh_quality_CUBIT_Abaqus/Makefile.in | 9 +++--
src/decompose_mesh/Makefile.in | 3 +-
src/generate_databases/Makefile.in | 9 ++---
src/meshfem3D/Makefile.in | 9 ++---
src/specfem3D/Makefile.in | 48 ++++++++++++++-----------
5 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/src/check_mesh_quality_CUBIT_Abaqus/Makefile.in b/src/check_mesh_quality_CUBIT_Abaqus/Makefile.in
index dfd4b4a..1176ee0 100644
--- a/src/check_mesh_quality_CUBIT_Abaqus/Makefile.in
+++ b/src/check_mesh_quality_CUBIT_Abaqus/Makefile.in
@@ -56,21 +56,24 @@ default: $(DEFAULT)
all: default
check_mesh_quality_CUBIT_Abaqus: xcheck_mesh_quality_CUBIT_Abaqus
+xcheck_mesh_quality_CUBIT_Abaqus: $E/xcheck_mesh_quality_CUBIT_Abaqus
convert_skewness_to_angle: xconvert_skewness_to_angle
+xconvert_skewness_to_angle: $E/xconvert_skewness_to_angle
multiply_CUBIT_Abaqus_mesh_by_1000: xmultiply_CUBIT_Abaqus_mesh_by_1000
+xmultiply_CUBIT_Abaqus_mesh_by_1000: $E/xmultiply_CUBIT_Abaqus_mesh_by_1000
####
#### rules for executables
####
# rules for the pure Fortran version
- at COND_PYRE_FALSE@xcheck_mesh_quality_CUBIT_Abaqus: $O/check_mesh_quality_CUBIT_Abaqus.o
+ at COND_PYRE_FALSE@$E/xcheck_mesh_quality_CUBIT_Abaqus: $O/check_mesh_quality_CUBIT_Abaqus.o
@COND_PYRE_FALSE@ ${FCLINK} -o $E/xcheck_mesh_quality_CUBIT_Abaqus $O/check_mesh_quality_CUBIT_Abaqus.o
@COND_PYRE_FALSE@
- at COND_PYRE_FALSE@xconvert_skewness_to_angle: $O/convert_skewness_to_angle.o
+ at COND_PYRE_FALSE@$E/xconvert_skewness_to_angle: $O/convert_skewness_to_angle.o
@COND_PYRE_FALSE@ ${FCLINK} -o $E/xconvert_skewness_to_angle $O/convert_skewness_to_angle.o
@COND_PYRE_FALSE@
- at COND_PYRE_FALSE@xmultiply_CUBIT_Abaqus_mesh_by_1000: $O/multiply_CUBIT_Abaqus_mesh_by_1000.o
+ at COND_PYRE_FALSE@$E/xmultiply_CUBIT_Abaqus_mesh_by_1000: $O/multiply_CUBIT_Abaqus_mesh_by_1000.o
@COND_PYRE_FALSE@ ${FCLINK} -o $E/xmultiply_CUBIT_Abaqus_mesh_by_1000 $O/multiply_CUBIT_Abaqus_mesh_by_1000.o
@COND_PYRE_FALSE@
diff --git a/src/decompose_mesh/Makefile.in b/src/decompose_mesh/Makefile.in
index 2ff5f79..441daa0 100644
--- a/src/decompose_mesh/Makefile.in
+++ b/src/decompose_mesh/Makefile.in
@@ -81,6 +81,7 @@ default: $(DEFAULT)
all: default
decompose_mesh: xdecompose_mesh
+xdecompose_mesh: $E/xdecompose_mesh
####
@@ -98,7 +99,7 @@ DEC_OBJECTS = \
$O/program_decompose_mesh.o
# rules for the pure Fortran version
- at COND_PYRE_FALSE@xdecompose_mesh:: $(DEC_OBJECTS)
+ at COND_PYRE_FALSE@$E/xdecompose_mesh: $(DEC_OBJECTS)
@COND_PYRE_FALSE@ ${FCLINK} -o $E/xdecompose_mesh $(DEC_OBJECTS) $(SCOTCH_INC) $(SCOTCH_LIBS)
@COND_PYRE_FALSE@
diff --git a/src/generate_databases/Makefile.in b/src/generate_databases/Makefile.in
index ff31acd..5606e56 100644
--- a/src/generate_databases/Makefile.in
+++ b/src/generate_databases/Makefile.in
@@ -170,7 +170,7 @@ LIBGENDATABASES = $L/libgendatabases.a
# default targets for the pure Fortran version
@COND_PYRE_FALSE at DEFAULT = \
- at COND_PYRE_FALSE@ generate_databases \
+ at COND_PYRE_FALSE@ xgenerate_databases \
@COND_PYRE_FALSE@ $(EMPTY_MACRO)
default: $(DEFAULT)
@@ -178,6 +178,7 @@ default: $(DEFAULT)
all: default
generate_databases: xgenerate_databases
+xgenerate_databases: $E/xgenerate_databases
@@ -186,15 +187,15 @@ generate_databases: xgenerate_databases
####
# rules for the pure Fortran version
- at COND_PYRE_FALSE@xgenerate_databases: $(XGENERATE_DATABASES_OBJECTS) $(COND_MPI_OBJECTS) $(KEEP_MAIN_PROGRAM_SEPARATE)
+ at COND_PYRE_FALSE@$E/xgenerate_databases: $(XGENERATE_DATABASES_OBJECTS) $(COND_MPI_OBJECTS) $(KEEP_MAIN_PROGRAM_SEPARATE)
@COND_PYRE_FALSE@ ${FCLINK} -o ${E}/xgenerate_databases $(KEEP_MAIN_PROGRAM_SEPARATE) $(COND_MPI_OBJECTS) $(XGENERATE_DATABASES_OBJECTS) $(MPILIBS) $(ADIOS_LINK)
@COND_PYRE_FALSE@
@COND_PYRE_FALSE@# solver also depends on values from mesher
clean:
- rm -f $O/* *.o *.gnu *.mod \
- xgenerate_databases
+ rm -f $O/* *.gnu *.mod \
+ $E/xgenerate_databases
###
### rule for the archive library
diff --git a/src/meshfem3D/Makefile.in b/src/meshfem3D/Makefile.in
index 88a57a6..f72164a 100644
--- a/src/meshfem3D/Makefile.in
+++ b/src/meshfem3D/Makefile.in
@@ -148,11 +148,11 @@ LIBMESHFEM = $(COND_PYRE_OBJECTS) $L/libmeshfem.a
# default targets for the pure Fortran version
@COND_PYRE_FALSE at DEFAULT = \
- at COND_PYRE_FALSE@ meshfem3D \
+ at COND_PYRE_FALSE@ xmeshfem3D \
@COND_PYRE_FALSE@ $(EMPTY_MACRO)
# default targets for the Pyrized version
- at COND_PYRE_TRUE@DEFAULT = meshfem3D
+ at COND_PYRE_TRUE@DEFAULT = xmeshfem3D
default: $(DEFAULT)
@@ -160,6 +160,7 @@ default: $(DEFAULT)
all: default
meshfem3D: xmeshfem3D
+xmeshfem3D: $E/xmeshfem3D
####
@@ -167,7 +168,7 @@ meshfem3D: xmeshfem3D
####
# rules for the pure Fortran version
- at COND_PYRE_FALSE@xmeshfem3D: $(XMESHFEM_OBJECTS) $(COND_MPI_OBJECTS)
+ at COND_PYRE_FALSE@$E/xmeshfem3D: $(XMESHFEM_OBJECTS) $(COND_MPI_OBJECTS)
@COND_PYRE_FALSE@ ${FCLINK} -o ${E}/xmeshfem3D $(XMESHFEM_OBJECTS) $(COND_MPI_OBJECTS) $(MPILIBS) ${ADIOS_LINK} ${O}/safe_alloc_mod.shared.o
@COND_PYRE_FALSE@
@COND_PYRE_FALSE@# solver also depends on values from mesher
@@ -175,7 +176,7 @@ meshfem3D: xmeshfem3D
clean:
- rm -f $O/* *.o xmeshfem3D
+ rm -f $O/* *.mod $E/xmeshfem3D
###
### rule for the archive library
diff --git a/src/specfem3D/Makefile.in b/src/specfem3D/Makefile.in
index b1767f5..b7c7454 100644
--- a/src/specfem3D/Makefile.in
+++ b/src/specfem3D/Makefile.in
@@ -346,13 +346,13 @@ LIBSPECFEM = $L/libspecfem.a
# default targets for the pure Fortran version
@COND_PYRE_FALSE at DEFAULT = \
- at COND_PYRE_FALSE@ specfem3D \
- at COND_PYRE_FALSE@ combine_vol_data \
- at COND_PYRE_FALSE@ combine_surf_data \
- at COND_PYRE_FALSE@ convolve_source_timefunction \
- at COND_PYRE_FALSE@ smooth_vol_data \
- at COND_PYRE_FALSE@ sum_kernels \
- at COND_PYRE_FALSE@ model_update \
+ at COND_PYRE_FALSE@ xspecfem3D \
+ at COND_PYRE_FALSE@ xcombine_vol_data \
+ at COND_PYRE_FALSE@ xcombine_surf_data \
+ at COND_PYRE_FALSE@ xconvolve_source_timefunction \
+ at COND_PYRE_FALSE@ xsmooth_vol_data \
+ at COND_PYRE_FALSE@ xsum_kernels \
+ at COND_PYRE_FALSE@ xmodel_update \
@COND_PYRE_FALSE@ $(EMPTY_MACRO)
default: $(DEFAULT)
@@ -360,6 +360,7 @@ default: $(DEFAULT)
all: default
specfem3D: xspecfem3D
+xspecfem3D: $E/xspecfem3D
#######################################
@@ -370,7 +371,7 @@ specfem3D: xspecfem3D
# rules for the pure Fortran version
@COND_PYRE_FALSE@# solver also depends on values from mesher
- at COND_PYRE_FALSE@xspecfem3D: $(XSPECFEM_OBJECTS) $(COND_MPI_OBJECTS) $(COND_OPENMP_OBJECTS)
+ at COND_PYRE_FALSE@$E/xspecfem3D: $(XSPECFEM_OBJECTS) $(COND_MPI_OBJECTS) $(COND_OPENMP_OBJECTS)
@COND_PYRE_FALSE@@COND_CUDA_TRUE@@COND_CUDA5_TRUE@ ${NVCCLINK} -o $(CUDA_DEVICE_OBJ) $(CUDA_OBJECTS)
@COND_PYRE_FALSE@@COND_CUDA_TRUE@@COND_CUDA5_TRUE@ ${FCLINK} -o ${E}/xspecfem3D $(XSPECFEM_OBJECTS) $(CUDA_DEVICE_OBJ) $(COND_MPI_OBJECTS) $(MPILIBS) $(COND_OPENMP_OBJECTS) $(OPENMP_LIBS) $(CUDA_LINK) $(ADIOS_LINK) $(LDFLAGS)
@COND_PYRE_FALSE@@COND_CUDA_TRUE@@COND_CUDA5_FALSE@ ${FCLINK} -o ${E}/xspecfem3D $(XSPECFEM_OBJECTS) $(COND_MPI_OBJECTS) $(MPILIBS) $(COND_OPENMP_OBJECTS) $(OPENMP_LIBS) $(CUDA_LINK) $(ADIOS_LINK) $(LDFLAGS)
@@ -378,40 +379,47 @@ specfem3D: xspecfem3D
@COND_PYRE_FALSE@
convolve_source_timefunction: xconvolve_source_timefunction
+xconvolve_source_timefunction: $E/xconvolve_source_timefunction
create_movie_shakemap_AVS_DX_GMT: xcreate_movie_shakemap_AVS_DX_GMT
+xcreate_movie_shakemap_AVS_DX_GMT: $E/xcreate_movie_shakemap_AVS_DX_GMT
combine_vol_data: xcombine_vol_data
+xcombine_vol_data: $E/xcombine_vol_data
combine_surf_data: xcombine_surf_data
+xcombine_surf_data: $E/xcombine_surf_data
smooth_vol_data: xsmooth_vol_data
+xsmooth_vol_data: $E/xsmooth_vol_data
sum_kernels: xsum_kernels
+xsum_kernels: $E/xsum_kernels
model_update: xmodel_update
+xmodel_update: $E/xmodel_update
-xconvolve_source_timefunction: $O/convolve_source_timefunction.shared.o
+$E/xconvolve_source_timefunction: $O/convolve_source_timefunction.shared.o
${FCCOMPILE_CHECK} -o ${E}/xconvolve_source_timefunction $O/convolve_source_timefunction.shared.o
- at COND_PYRE_FALSE@xcreate_movie_shakemap_AVS_DX_GMT: $O/create_movie_shakemap_AVS_DX_GMT.shared.o $(LIBSPECFEM) $(OUTPUT)/surface_from_mesher.h
+ at COND_PYRE_FALSE@$E/xcreate_movie_shakemap_AVS_DX_GMT: $O/create_movie_shakemap_AVS_DX_GMT.shared.o $(LIBSPECFEM) $(OUTPUT)/surface_from_mesher.h
@COND_PYRE_FALSE@ ${FCCOMPILE_CHECK} -o ${E}/xcreate_movie_shakemap_AVS_DX_GMT $O/create_movie_shakemap_AVS_DX_GMT.shared.o $(LIBSPECFEM) -I$(OUTPUT)
-xcombine_vol_data: $(COMBINE_VOL_DATA_OBJECTS)
+$E/xcombine_vol_data: $(COMBINE_VOL_DATA_OBJECTS)
${MPIFCCOMPILE_CHECK} -o ${E}/xcombine_vol_data $(COMBINE_VOL_DATA_OBJECTS) $(ADIOS_INC) $(ADIOS_LINK)
-xcombine_surf_data: $O/combine_surf_data.shared.o $O/write_c_binary.cc.o $O/param_reader.cc.o
+$E/xcombine_surf_data: $O/combine_surf_data.shared.o $O/write_c_binary.cc.o $O/param_reader.cc.o
${FCCOMPILE_CHECK} -o ${E}/xcombine_surf_data $O/combine_surf_data.shared.o $O/write_c_binary.cc.o $O/param_reader.cc.o
-xsmooth_vol_data: $O/smooth_vol_data.o $O/read_parameter_file.shared.o $O/read_value_parameters.shared.o $O/get_value_parameters.shared.o $O/param_reader.cc.o $O/gll_library.shared.o $O/exit_mpi.shared.o $(COND_MPI_OBJECTS)
+$E/xsmooth_vol_data: $O/smooth_vol_data.o $O/read_parameter_file.shared.o $O/read_value_parameters.shared.o $O/get_value_parameters.shared.o $O/param_reader.cc.o $O/gll_library.shared.o $O/exit_mpi.shared.o $(COND_MPI_OBJECTS)
${FCLINK} -o ${E}/xsmooth_vol_data $O/smooth_vol_data.o $O/read_parameter_file.shared.o $O/read_value_parameters.shared.o $O/get_value_parameters.shared.o $O/param_reader.cc.o $O/gll_library.shared.o $O/exit_mpi.shared.o $(COND_MPI_OBJECTS) $(MPILIBS)
-xsum_kernels: $(SUM_KERNELS_OBJECTS) $(COND_MPI_OBJECTS)
+$E/xsum_kernels: $(SUM_KERNELS_OBJECTS) $(COND_MPI_OBJECTS)
${FCLINK} -o ${E}/xsum_kernels $(SUM_KERNELS_OBJECTS) $(COND_MPI_OBJECTS) $(MPILIBS)
-xmodel_update: $(ADIOS_PREOBJECTS) $(MODEL_UPD_OBJECTS) $(COND_MPI_OBJECTS) $(CUDA_STUBS)
+$E/xmodel_update: $(ADIOS_PREOBJECTS) $(MODEL_UPD_OBJECTS) $(COND_MPI_OBJECTS) $(CUDA_STUBS)
${FCLINK} -o ${E}/xmodel_update $(ADIOS_OBJECTS) $(MODEL_UPD_OBJECTS) $(ADIOS_PREOBJECTS) $(COND_MPI_OBJECTS) $(MPILIBS) $(CUDA_STUBS)
clean:
- rm -f $O/* *.o *.gnu *.mod \
- xspecfem3D \
- xconvolve_source_timefunction \
- xcreate_movie_shakemap_AVS_DX_GMT xcombine_vol_data xcombine_surf_data \
- xsmooth_vol_data xmodel_update xsum_kernels
+ rm -f $O/* *.gnu *.mod \
+ $E/xspecfem3D \
+ $E/xconvolve_source_timefunction \
+ $E/xcreate_movie_shakemap_AVS_DX_GMT $E/xcombine_vol_data $E/xcombine_surf_data \
+ $E/xsmooth_vol_data $E/xmodel_update $E/xsum_kernels
#######################################
More information about the CIG-COMMITS
mailing list