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

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2013-01-18 09:48:48 -0800 (Fri, 18 Jan 2013)
New Revision: 21277

Modified:
   seismo/2D/SPECFEM2D/trunk/Makefile.in
   seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in
Log:
done fixing the "make realclean" problem found by Paul Cristini (my earlier fix yesterday worked with CSH but not with BASH)


Modified: seismo/2D/SPECFEM2D/trunk/Makefile.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/Makefile.in	2013-01-18 02:11:52 UTC (rev 21276)
+++ seismo/2D/SPECFEM2D/trunk/Makefile.in	2013-01-18 17:48:48 UTC (rev 21277)
@@ -108,9 +108,7 @@
 
 
 clean:
-	(rm -rf obj bin src/meshfem2D/*.mod src/specfem2D/*.mod)
-	(pushd src/meshfem2D/scotch/src ; make realclean ; popd)
-	(pushd src/meshfem2D/scotch/src/libscotch ; make scotch.h scotchf.h ; cp -f scotch.h scotchf.h ../../include ; popd)
+	(rm -rf obj bin src/meshfem2D/*.mod src/specfem2D/*.mod ; cd src/meshfem2D/scotch/src ; make realclean)
 
 help:
 	@echo "usage: make [executable]"

Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in	2013-01-18 02:11:52 UTC (rev 21276)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/Makefile.in	2013-01-18 17:48:48 UTC (rev 21277)
@@ -107,7 +107,7 @@
 	$O/spline_routines.o \
 	$O/meshfem2D.o
 
-default: scotch $(DEFAULT)
+default: scotch_library $(DEFAULT)
 
 all: clean default
 
@@ -116,7 +116,7 @@
 check_quality_external_mesh: xcheck_quality_external_mesh
 
 
-scotch:
+scotch_library:
 ifeq (@USE_BUNDLED_SCOTCH@,1)
 	(echo "Using bundled Scotch")
 	(cd "@SCOTCH_DIR@/src"; make)