[cig-commits] r22493 - in seismo/3D/SPECFEM3D/trunk: . src/decompose_mesh
elliott.sales.de.andrade at geodynamics.org
elliott.sales.de.andrade at geodynamics.org
Tue Jul 2 14:43:33 PDT 2013
Author: elliott.sales.de.andrade
Date: 2013-07-02 14:43:33 -0700 (Tue, 02 Jul 2013)
New Revision: 22493
Modified:
seismo/3D/SPECFEM3D/trunk/Makefile.in
seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/Makefile.in
Log:
Fix recursive make calls.
At some point, I should probably change this to be non-recursive.
Modified: seismo/3D/SPECFEM3D/trunk/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/Makefile.in 2013-07-02 21:41:00 UTC (rev 22492)
+++ seismo/3D/SPECFEM3D/trunk/Makefile.in 2013-07-02 21:43:33 UTC (rev 22493)
@@ -128,47 +128,46 @@
(cd obj; mkdir -p che)
xmeshfem3D: required reqmesh
- (cd src/meshfem3D; make)
+ $(MAKE) -C src/meshfem3D
xspecfem3D: required reqspec
- (cd src/specfem3D; make specfem3D)
+ $(MAKE) -C src/specfem3D specfem3D
xgenerate_databases: required reqgen
- (cd src/generate_databases ; make generate_databases)
+ $(MAKE) -C src/generate_databases generate_databases
xdecompose_mesh: required reqdec
- (cd src/decompose_mesh ; make)
+ $(MAKE) -C src/decompose_mesh
xcreate_movie_shakemap_AVS_DX_GMT: required
- (cd src/specfem3D ; make xcreate_movie_shakemap_AVS_DX_GMT)
+ $(MAKE) -C src/specfem3D xcreate_movie_shakemap_AVS_DX_GMT
xcombine_vol_data: required reqspec
- (cd src/specfem3D ; make xcombine_vol_data)
+ $(MAKE) -C src/specfem3D xcombine_vol_data
xcombine_surf_data: required
- (cd src/specfem3D ; make xcombine_surf_data)
+ $(MAKE) -C src/specfem3D xcombine_surf_data
xconvolve_source_timefunction: required
- (cd src/specfem3D ; make xconvolve_source_timefunction)
+ $(MAKE) -C src/specfem3D xconvolve_source_timefunction
xsmooth_vol_data: required reqspec
- (cd src/specfem3D ; make xsmooth_vol_data)
+ $(MAKE) -C src/specfem3D xsmooth_vol_data
xsum_kernels: required reqspec
- (cd src/specfem3D ; make xsum_kernels)
+ $(MAKE) -C src/specfem3D xsum_kernels
xmodel_update: required reqspec xspecfem3D
- (cd src/specfem3D ; make xmodel_update)
+ $(MAKE) -C src/specfem3D xmodel_update
-
xcheck_mesh_quality_CUBIT_Abaqus: required reqche
- (cd src/check_mesh_quality_CUBIT_Abaqus ; make)
+ $(MAKE) -C src/check_mesh_quality_CUBIT_Abaqus
clean: required
- (rm -rf bin lib obj src/meshfem3D/*.mod src/decompose_mesh/*.mod src/generate_databases/*.mod src/specfem3D/*.mod ; cd src/decompose_mesh/scotch/src ; make realclean)
+ rm -rf bin lib obj src/meshfem3D/*.mod src/decompose_mesh/*.mod src/generate_databases/*.mod src/specfem3D/*.mod
+ $(MAKE) -C src/decompose_mesh/scotch/src realclean
-
help:
@echo "usage: make [executable]"
@echo ""
Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/Makefile.in 2013-07-02 21:41:00 UTC (rev 22492)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/Makefile.in 2013-07-02 21:43:33 UTC (rev 22493)
@@ -104,10 +104,10 @@
xscotch:
ifeq (@USE_BUNDLED_SCOTCH@,1)
- (echo "Using bundled Scotch")
- (cd @SCOTCH_DIR@/src; make)
+ echo "Using bundled Scotch"
+ $(MAKE) -C @SCOTCH_DIR@/src
else
- (echo "Not using bundled Scotch")
+ echo "Not using bundled Scotch"
endif
More information about the CIG-COMMITS
mailing list