[cig-commits] r21869 - in seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/scotch_5.1.12b/src: libscotch scotch

dkomati1 at geodynamics.org dkomati1 at geodynamics.org
Sat Apr 13 16:04:39 PDT 2013 

Author: dkomati1
Date: 2013-04-13 16:04:38 -0700 (Sat, 13 Apr 2013)
New Revision: 21869

Modified:
   seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/scotch_5.1.12b/src/libscotch/Makefile
   seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/scotch_5.1.12b/src/scotch/Makefile
Log:
re-added the Scotch Makefiles, which had been modified by an erroneous commit from Vadim


Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/scotch_5.1.12b/src/libscotch/Makefile
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/scotch_5.1.12b/src/libscotch/Makefile	2013-04-13 22:51:42 UTC (rev 21868)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/scotch_5.1.12b/src/libscotch/Makefile	2013-04-13 23:04:38 UTC (rev 21869)
@@ -68,23 +68,10 @@
 					libptscotcherr$(LIB)						\
 					libptscotcherrexit$(LIB)
 
-# libscotch replacement text for install line
-$(libdir)/libscotch$(LIB): libscotch$(LIB)
-	-$(CP) libscotch$(LIB) $(libdir)
-$(libdir)/libscotcherr$(LIB): libscotcherr$(LIB)
-	-$(CP) libscotcherr$(LIB) $(libdir)
-$(libdir)/libscotcherrexit$(LIB): libscotcherrexit$(LIB)
-	-$(CP) libscotcherrexit$(LIB) $(libdir)
-$(includedir)/scotch.h: scotch.h
-	-$(CP) scotch.h $(includedir)
-$(includedir)/scotchf.h: scotchf.h
-	-$(CP) scotchf.h $(includedir)
+install				:
+					-$(CP) scotch.h scotchf.h $(includedir)
+					-$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir)
 
-install				: $(libdir)/libscotch$(LIB) $(libdir)/libscotcherr$(LIB) \
-	$(libdir)/libscotcherrexit$(LIB)	\
-	$(includedir)/scotch.h $(includedir)/scotchf.h
-
-
 ptinstall			:
 					-$(CP) scotch.h $(includedir)/ptscotch.h
 					-$(CP) scotchf.h $(includedir)/ptscotchf.h

Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/scotch_5.1.12b/src/scotch/Makefile
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/scotch_5.1.12b/src/scotch/Makefile	2013-04-13 22:51:42 UTC (rev 21868)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/scotch_5.1.12b/src/scotch/Makefile	2013-04-13 23:04:38 UTC (rev 21869)
@@ -95,81 +95,10 @@
 					dgscat$(EXE)				\
 					dgtst$(EXE)
 
-# scotch replacement text for install line
-$(bindir)/acpl$(EXE): acpl$(EXE)
-	-$(CP) acpl$(EXE) $(bindir)/acpl$(EXE)
-$(bindir)/amk_ccc$(EXE): amk_ccc$(EXE)
-	-$(CP) amk_ccc$(EXE) $(bindir)/amk_ccc$(EXE)
-$(bindir)/amk_fft2$(EXE): amk_fft2$(EXE)
-	-$(CP) amk_fft2$(EXE) $(bindir)/amk_fft2$(EXE)
-$(bindir)/amk_grf$(EXE): amk_grf$(EXE)
-	-$(CP) amk_grf$(EXE) $(bindir)/amk_grf$(EXE)
-$(bindir)/amk_hy$(EXE): amk_hy$(EXE)
-	-$(CP) amk_hy$(EXE) $(bindir)/amk_hy$(EXE)
-$(bindir)/amk_m2$(EXE): amk_m2$(EXE)
-	-$(CP) amk_m2$(EXE) $(bindir)/amk_m2$(EXE)
-$(bindir)/amk_p2$(EXE): amk_p2$(EXE)
-	-$(CP) amk_p2$(EXE) $(bindir)/amk_p2$(EXE)
-$(bindir)/atst$(EXE): atst$(EXE)
-	-$(CP) atst$(EXE) $(bindir)/atst$(EXE)
-$(bindir)/gbase$(EXE): gbase$(EXE)
-	-$(CP) gbase$(EXE) $(bindir)/gbase$(EXE)
-$(bindir)/gcv$(EXE): gcv$(EXE)
-	-$(CP) gcv$(EXE) $(bindir)/gcv$(EXE)
-$(bindir)/gmap$(EXE): gmap$(EXE)
-	-$(CP) gmap$(EXE) $(bindir)/gmap$(EXE)
-$(bindir)/gmk_hy$(EXE): gmk_hy$(EXE)
-	-$(CP) gmk_hy$(EXE) $(bindir)/gmk_hy$(EXE)
-$(bindir)/gmk_m2$(EXE): gmk_m2$(EXE)
-	-$(CP) gmk_m2$(EXE) $(bindir)/gmk_m2$(EXE)
-$(bindir)/gmk_m3$(EXE): gmk_m3$(EXE)
-	-$(CP) gmk_m3$(EXE) $(bindir)/gmk_m3$(EXE)
-$(bindir)/gmk_msh$(EXE): gmk_msh$(EXE)
-	-$(CP) gmk_msh$(EXE) $(bindir)/gmk_msh$(EXE)
-$(bindir)/gmk_ub2$(EXE): gmk_ub2$(EXE)
-	-$(CP) gmk_ub2$(EXE) $(bindir)/gmk_ub2$(EXE)
-$(bindir)/gmtst$(EXE): gmtst$(EXE)
-	-$(CP) gmtst$(EXE) $(bindir)/gmtst$(EXE)
-$(bindir)/gord$(EXE): gord$(EXE)
-	-$(CP) gord$(EXE) $(bindir)/gord$(EXE)
-$(bindir)/gotst$(EXE): gotst$(EXE)
-	-$(CP) gotst$(EXE) $(bindir)/gotst$(EXE)
-$(bindir)/gout$(EXE): gout$(EXE)
-	-$(CP) gout$(EXE) $(bindir)/gout$(EXE)
-$(bindir)/gpart$(EXE): $(bindir)/gmap$(EXE)
-	-$(RM) $(bindir)/gpart$(EXE)
-	-$(LN) $(bindir)/gmap$(EXE) $(bindir)/gpart$(EXE)
-$(bindir)/gscat$(EXE): gscat$(EXE)
-	-$(CP) gscat$(EXE) $(bindir)/gscat$(EXE)
-$(bindir)/gtst$(EXE): gtst$(EXE)
-	-$(CP) gtst$(EXE) $(bindir)/gtst$(EXE)
-$(bindir)/mcv$(EXE): mcv$(EXE)
-	-$(CP) mcv$(EXE) $(bindir)/mcv$(EXE)
-$(bindir)/mmk_m2$(EXE): mmk_m2$(EXE)
-	-$(CP) mmk_m2$(EXE) $(bindir)/mmk_m2$(EXE)
-$(bindir)/mmk_m3$(EXE): mmk_m3$(EXE)
-	-$(CP) mmk_m3$(EXE) $(bindir)/mmk_m3$(EXE)
-$(bindir)/mord$(EXE): mord$(EXE)
-	-$(CP) mord$(EXE) $(bindir)/mord$(EXE)
-$(bindir)/mtst$(EXE): mtst$(EXE)
-	-$(CP) mtst$(EXE) $(bindir)/mtst$(EXE)
+install				:
+					-$(CP) acpl$(EXE) amk_ccc$(EXE) amk_fft2$(EXE) amk_grf$(EXE) amk_hy$(EXE) amk_m2$(EXE) amk_p2$(EXE) atst$(EXE) gbase$(EXE) gcv$(EXE) gmap$(EXE) gmk_hy$(EXE) gmk_m2$(EXE) gmk_m3$(EXE) gmk_msh$(EXE) gmk_ub2$(EXE) gmtst$(EXE) gord$(EXE) gotst$(EXE) gout$(EXE) gpart$(EXE) *gtst$(EXE) gscat$(EXE) mcv$(EXE) mmk_m2$(EXE) mmk_m3$(EXE) mord$(EXE) mtst$(EXE) $(bindir)
 
-
-install				: $(bindir)/acpl$(EXE) $(bindir)/amk_ccc$(EXE) \
-	$(bindir)/amk_fft2$(EXE) $(bindir)/amk_grf$(EXE) \
-	$(bindir)/amk_hy$(EXE) $(bindir)/amk_m2$(EXE) \
-	$(bindir)/amk_p2$(EXE) $(bindir)/atst$(EXE) \
-	$(bindir)/gbase$(EXE) $(bindir)/gcv$(EXE) \
-	$(bindir)/gmap$(EXE) $(bindir)/gmk_hy$(EXE) \
-	$(bindir)/gmk_m2$(EXE) $(bindir)/gmk_m3$(EXE) \
-	$(bindir)/gmk_msh$(EXE) $(bindir)/gmk_ub2$(EXE) \
-	$(bindir)/gmtst$(EXE) $(bindir)/gord$(EXE) \
-	$(bindir)/gotst$(EXE) $(bindir)/gout$(EXE) \
-	$(bindir)/gpart$(EXE) $(bindir)/gscat$(EXE) \
-	$(bindir)/gtst$(EXE) $(bindir)/mcv$(EXE) \
-	$(bindir)/mmk_m2$(EXE) $(bindir)/mmk_m3$(EXE) \
-	$(bindir)/mord$(EXE) $(bindir)/mtst$(EXE)
-
+ptinstall			:
 					-$(CP) dggath$(EXE) dgmap$(EXE) dgord$(EXE) dgpart$(EXE) dgscat$(EXE) dgtst$(EXE) $(bindir)
 
 clean				:

More information about the CIG-COMMITS mailing list