[cig-commits] r22804 - in seismo/3D/SPECFEM3D/trunk/src: generate_databases meshfem3D specfem3D

[lefebvre at geodynamics.org]

Author: lefebvre
Date: 2013-09-19 16:00:37 -0700 (Thu, 19 Sep 2013)
New Revision: 22804

Modified:
   seismo/3D/SPECFEM3D/trunk/src/generate_databases/Makefile.in
   seismo/3D/SPECFEM3D/trunk/src/meshfem3D/Makefile.in
   seismo/3D/SPECFEM3D/trunk/src/specfem3D/Makefile.in
Log:
Fix Makefile.in bug. -> adios_manager stubs compiled first.

Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/Makefile.in	2013-09-18 14:51:29 UTC (rev 22803)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/Makefile.in	2013-09-19 23:00:37 UTC (rev 22804)
@@ -146,12 +146,13 @@
 	$O/model_gll_adios.adios.o \
 	$O/model_ipati_adios.adios.o
 
+ADIOS_PRESTUBS = \
+	$O/adios_manager_stubs.shared_noadios.o
 ADIOS_STUBS = \
-	$O/adios_manager_stubs.shared_noadios.o \
 	$O/generate_databases_adios_stubs.noadios.o
 
 @COND_ADIOS_FALSE at ADIOS_OBJECTS = $(ADIOS_STUBS)
- at COND_ADIOS_FALSE@ADIOS_PREOBJECTS =
+ at COND_ADIOS_FALSE@ADIOS_PREOBJECTS = $(ADIOS_PRESTUBS)
 
 KEEP_MAIN_PROGRAM_SEPARATE = $O/program_generate_databases.o
 

Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/Makefile.in	2013-09-18 14:51:29 UTC (rev 22803)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/Makefile.in	2013-09-19 23:00:37 UTC (rev 22804)
@@ -126,12 +126,13 @@
 ADIOS_OBJECTS= \
 	$O/save_databases_adios.adios.o 
 
+ADIOS_PRESTUBS = \
+	$O/adios_manager_stubs.shared_noadios.o
 ADIOS_STUBS = \
-	$O/adios_manager_stubs.shared_noadios.o \
 	$O/meshfem3D_adios_stubs.noadios.o
 
 @COND_ADIOS_FALSE at ADIOS_OBJECTS = $(ADIOS_STUBS)
- at COND_ADIOS_FALSE@ADIOS_PREOBJECTS =
+ at COND_ADIOS_FALSE@ADIOS_PREOBJECTS = $(ADIOS_PRESTUBS)
 
 
 # objects toggled between the parallel and serial version

Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/Makefile.in	2013-09-18 14:51:29 UTC (rev 22803)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/Makefile.in	2013-09-19 23:00:37 UTC (rev 22804)
@@ -290,14 +290,15 @@
 	$O/read_forward_arrays_adios.adios.o \
 	$O/save_kernels_adios.adios.o
 
+ADIOS_PRESTUBS = \
+	$O/adios_manager_stubs.shared_noadios.o
 ADIOS_STUBS = \
-	$O/adios_manager_stubs.shared_noadios.o \
 	$O/specfem3D_adios_stubs.noadios.o
 
 #@COND_ADIOS_TRUE at XSPECFEM_OBJECTS_ADIOS = $(ADIOS_PREOBJECTS) $(XSPECFEM_OBJECTS_PRE) $(ADIOS_OBJECTS)
 #@COND_ADIOS_FALSE at XSPECFEM_OBJECTS_ADIOS = $(ADIOS_STUBS) $(XSPECFEM_OBJECTS_PRE)
 @COND_ADIOS_FALSE at ADIOS_OBJECTS = $(ADIOS_STUBS)
- at COND_ADIOS_FALSE@ADIOS_PREOBJECTS=
+ at COND_ADIOS_FALSE@ADIOS_PREOBJECTS= $(ADIOS_PRESTUBS)
 
 # ADIOS
 # with configure: ./configure --with-cuda ADIOS_LIB=.. ADIOS_INC=.. MPI_INC=..