[cig-commits] [commit] devel, master: build: Update rules for auxiliaries without duplicate code. (558dbe7)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem3d_globe

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

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

commit 558dbe7fa524ae31945d49243641601f13330cf5
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Sat Sep 6 15:29:52 2014 -0400

    build: Update rules for auxiliaries without duplicate code.


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

558dbe7fa524ae31945d49243641601f13330cf5
 Makefile.in              | 24 ++++++++++--------------
 src/auxiliaries/rules.mk | 17 ++++++++---------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cd60d2c..1d757ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -225,25 +225,21 @@ DEFAULT = \
 	xcreate_header_file \
 	xmeshfem3D \
 	xspecfem3D \
-	xcombine_surf_data \
 	xcombine_AVS_DX \
+	xcombine_surf_data \
+	xcombine_vol_data \
+	xcombine_vol_data_vtk \
 	xconvolve_source_timefunction \
 	xcreate_movie_AVS_DX \
 	xcreate_movie_GMT_global \
 	$(EMPTY_MACRO)
-## DK DK comments out all the xcombine_vol_data* for now because they depend on $O/combine_vol_data_shared.aux.o, which contained duplicated code and which I have thus removed
-## DK DK put this back in the above list of default targets if you want to compile them again,
-## DK DK when adding comments I need to move them outside of the list to avoid getting an error from "make"
-#	xcombine_vol_data \
-#	xcombine_vol_data_vtk \
-
-## DK DK comments out all the xcombine_vol_data* for now because they depend on $O/combine_vol_data_shared.aux.o, which contained duplicated code and which I have thus removed
-#ifeq ($(ADIOS), yes)
-#DEFAULT += 	\
-#	xcombine_vol_data_adios \
-#	xcombine_vol_data_vtk_adios \
-#	$(EMPTY_MACRO)
-#endif
+
+ifeq ($(ADIOS), yes)
+DEFAULT += 	\
+	xcombine_vol_data_adios \
+	xcombine_vol_data_vtk_adios \
+	$(EMPTY_MACRO)
+endif
 
 all: default
 
diff --git a/src/auxiliaries/rules.mk b/src/auxiliaries/rules.mk
index 198be60..70d3985 100644
--- a/src/auxiliaries/rules.mk
+++ b/src/auxiliaries/rules.mk
@@ -101,18 +101,17 @@ ${E}/xcombine_AVS_DX: $(auxiliaries_SHARED_OBJECTS) $O/get_cmt.solver.o $O/combi
 ${E}/xcombine_paraview_strain_data: $(auxiliaries_SHARED_OBJECTS) $O/combine_paraview_strain_data.auxsolver.o $O/binary_c_io.cc.o
 	${FCCOMPILE_CHECK} -o $@ $+
 
-## DK DK comments out all the ${E}/xcombine_vol_data* for now because they depend on $O/combine_vol_data_shared.aux.o, which contained duplicated code and which I have thus removed
-#${E}/xcombine_vol_data: $(auxiliaries_SHARED_OBJECTS) $O/combine_vol_data.auxsolver.o $O/binary_c_io.cc.o $O/combine_vol_data_shared.aux.o
-#	${FCCOMPILE_CHECK} -o $@ $+
+${E}/xcombine_vol_data: $(auxiliaries_SHARED_OBJECTS) $O/combine_vol_data.auxsolver.o $O/binary_c_io.cc.o
+	${FCCOMPILE_CHECK} -o $@ $+
 
-#${E}/xcombine_vol_data_adios: $(auxiliaries_SHARED_OBJECTS) $O/combine_vol_data_adios_impl.auxmpi.o $O/combine_vol_data.auxadios.o $O/binary_c_io.cc.o $O/combine_vol_data_shared.aux.o $O/parallel.sharedmpi.o
-#	${MPIFCCOMPILE_CHECK} -o $@ $+ $(MPILIBS)
+${E}/xcombine_vol_data_adios: $(auxiliaries_SHARED_OBJECTS) $O/combine_vol_data_adios_impl.auxmpi.o $O/combine_vol_data.auxadios.o $O/binary_c_io.cc.o $O/parallel.sharedmpi.o
+	${MPIFCCOMPILE_CHECK} -o $@ $+ $(MPILIBS)
 
-#${E}/xcombine_vol_data_vtk_adios: $(auxiliaries_SHARED_OBJECTS) $O/combine_vol_data_adios_impl.auxmpi.o $O/combine_vol_data.auxadios_vtk.o $O/binary_c_io.cc.o $O/combine_vol_data_shared.aux.o $O/parallel.sharedmpi.o
-#	${MPIFCCOMPILE_CHECK} -o $@ $+ $(MPILIBS)
+${E}/xcombine_vol_data_vtk_adios: $(auxiliaries_SHARED_OBJECTS) $O/combine_vol_data_adios_impl.auxmpi.o $O/combine_vol_data.auxadios_vtk.o $O/binary_c_io.cc.o $O/parallel.sharedmpi.o
+	${MPIFCCOMPILE_CHECK} -o $@ $+ $(MPILIBS)
 
-#${E}/xcombine_vol_data_vtk: $(auxiliaries_SHARED_OBJECTS) $O/combine_vol_data.auxsolver_vtk.o $O/binary_c_io.cc.o $O/combine_vol_data_shared.aux.o
-#	${FCCOMPILE_CHECK} -o $@ $+
+${E}/xcombine_vol_data_vtk: $(auxiliaries_SHARED_OBJECTS) $O/combine_vol_data.auxsolver_vtk.o $O/binary_c_io.cc.o
+	${FCCOMPILE_CHECK} -o $@ $+
 
 ${E}/xcombine_surf_data: $(auxiliaries_SHARED_OBJECTS) $O/combine_surf_data.auxsolver.o $O/binary_c_io.cc.o
 	${FCCOMPILE_CHECK} -o $@ $+