[cig-commits] r22500 - in seismo/2D/SPECFEM2D/trunk: . src/meshfem2D

[elliott.sales.de.andrade at geodynamics.org]

Author: elliott.sales.de.andrade
Date: 2013-07-02 23:32:16 -0700 (Tue, 02 Jul 2013)
New Revision: 22500

Modified:
   seismo/2D/SPECFEM2D/trunk/Makefile.in
   seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in
Log:
Fix recursive make calls.

At some point, I should probably change this to be non-recursive.

Modified: seismo/2D/SPECFEM2D/trunk/Makefile.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/Makefile.in	2013-07-03 00:25:28 UTC (rev 22499)
+++ seismo/2D/SPECFEM2D/trunk/Makefile.in	2013-07-03 06:32:16 UTC (rev 22500)
@@ -79,36 +79,37 @@
 ## mesher
 ##
 xmeshfem2D:  required
-	     (cd src/meshfem2D; make )
+	$(MAKE) -C src/meshfem2D
 
 ##
 ## check_quality_external_mesh
 ##
 xcheck_quality_external_mesh: required
-	(cd src/meshfem2D ; make xcheck_quality_external_mesh)
+	$(MAKE) -C src/meshfem2D xcheck_quality_external_mesh
 
 ##
 ## solver
 ##
 xspecfem2D:  required
-	     (cd src/specfem2D; make specfem2D)
+	$(MAKE) -C src/specfem2D specfem2D
 
 ##
 ## convolve_source_timefunction
 ##
 xconvolve_source_timefunction: required
-	(cd src/specfem2D ; make xconvolve_source_timefunction)
+	$(MAKE) -C src/specfem2D xconvolve_source_timefunction
 
 
 ##
 ## adj_seismogram
 ##
 xadj_seismogram: required
-	(cd src/specfem2D ; make xadj_seismogram)
+	$(MAKE) -C src/specfem2D xadj_seismogram
 
 
 clean:
-	(rm -rf obj bin src/meshfem2D/*.mod src/specfem2D/*.mod ; cd src/meshfem2D/scotch/src ; make realclean)
+	rm -rf obj bin src/meshfem2D/*.mod src/specfem2D/*.mod
+	$(MAKE) -C src/meshfem2D/scotch/src realclean
 
 help:
 	@echo "usage: make [executable]"

Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in	2013-07-03 00:25:28 UTC (rev 22499)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in	2013-07-03 06:32:16 UTC (rev 22500)
@@ -118,10 +118,10 @@
 
 scotch_library:
 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