[cig-commits] [commit] devel: build: Fix module dependencies in auxiliaries. (bbc5532)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem3d_globe

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d_globe/compare/c58836eea530691b891eb26a61bddd1a87ec348c...46b00e6b38b82d267194090fb713f38485f162cc

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

commit bbc55329121c60a1a9de9e4f2b2f6cea95458a07
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Fri Apr 18 23:40:41 2014 -0400

    build: Fix module dependencies in auxiliaries.
    
    Don't build ADIOS targets if not configured with it. Add some
    dependencies for modules used with ADIOS files. Correctly define phony
    targets.


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

bbc55329121c60a1a9de9e4f2b2f6cea95458a07
 src/auxiliaries/rules.mk | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/auxiliaries/rules.mk b/src/auxiliaries/rules.mk
index 6e2a590..3c3e93a 100644
--- a/src/auxiliaries/rules.mk
+++ b/src/auxiliaries/rules.mk
@@ -33,14 +33,19 @@ auxiliaries_TARGETS = \
 	$E/xcombine_paraview_strain_data \
 	$E/xcombine_vol_data \
 	$E/xcombine_vol_data_vtk \
-	$E/xcombine_vol_data_adios \
-	$E/xcombine_vol_data_vtk_adios \
 	$E/xcombine_surf_data \
 	$E/xcreate_movie_AVS_DX \
 	$E/xcreate_movie_GMT_global \
 	$E/xextract_database \
 	$(EMPTY_MACRO)
 
+ifeq ($(ADIOS),yes)
+auxiliaries_TARGETS += \
+	$E/xcombine_vol_data_adios \
+	$E/xcombine_vol_data_vtk_adios \
+	$(EMPTY_MACRO)
+endif
+
 auxiliaries_OBJECTS = \
 	$O/combine_AVS_DX.aux.o \
 	$O/combine_paraview_strain_data.auxsolver.o \
@@ -80,9 +85,11 @@ auxiliaries_SHARED_OBJECTS = \
 #### rules for executables
 ####
 
-all_aux: required $(auxiliaries_TARGETS)
+.PHONY: all_aux aux
 
-aux: required $(auxiliaries_TARGETS)
+all_aux: $(auxiliaries_TARGETS)
+
+aux: $(auxiliaries_TARGETS)
 
 ${E}/xconvolve_source_timefunction: $(auxiliaries_SHARED_OBJECTS) $O/convolve_source_timefunction.aux.o
 	${FCCOMPILE_CHECK} -o ${E}/xconvolve_source_timefunction $(auxiliaries_SHARED_OBJECTS) $O/convolve_source_timefunction.aux.o
@@ -128,6 +135,13 @@ $(auxiliaries_OBJECTS): S := ${S_TOP}/src/auxiliaries
 ####
 
 ##
+## additional rules
+##
+
+$O/combine_vol_data.auxadios.o: $O/combine_vol_data_adios_impl.auxmpi.o
+$O/combine_vol_data.auxadios_vtk.o: $O/combine_vol_data_adios_impl.auxmpi.o
+
+##
 ## auxiliaries
 ##
 $O/%.aux.o: $S/%.f90 $O/shared_par.shared_module.o