Index: issm/trunk/externalpackages/scotch/scotch.patch
===================================================================
--- issm/trunk/externalpackages/scotch/scotch.patch	(revision 3650)
+++ issm/trunk/externalpackages/scotch/scotch.patch	(revision 4629)
@@ -1,8 +1,8 @@
-Only in new3: bin
-Only in new3: include
-Only in new3: lib
-diff -rc src/src/libscotch/arch.c new3/src/libscotch/arch.c
+Only in new4: bin
+Only in new4: include
+Only in new4: lib
+diff -rc src/src/libscotch/arch.c new4/src/libscotch/arch.c
 *** src/src/libscotch/arch.c	2008-09-27 07:48:01.000000000 -0700
---- new3/src/libscotch/arch.c	2010-04-30 10:28:22.088131040 -0700
+--- new4/src/libscotch/arch.c	2010-05-03 15:37:55.104089848 -0700
 ***************
 *** 173,187 ****
@@ -68,7 +68,7 @@
         memset     (archptr, 0, sizeof (Arch));     /* Initialize architecture body */
         return     (1);
-diff -rc src/src/libscotch/arch_cmplt.c new3/src/libscotch/arch_cmplt.c
+diff -rc src/src/libscotch/arch_cmplt.c new4/src/libscotch/arch_cmplt.c
 *** src/src/libscotch/arch_cmplt.c	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_cmplt.c	2010-04-30 10:28:22.093131042 -0700
+--- new4/src/libscotch/arch_cmplt.c	2010-05-03 15:37:55.111089854 -0700
 ***************
 *** 90,99 ****
@@ -120,7 +120,7 @@
       return     (1);
     }
-diff -rc src/src/libscotch/arch_cmplt.h new3/src/libscotch/arch_cmplt.h
+diff -rc src/src/libscotch/arch_cmplt.h new4/src/libscotch/arch_cmplt.h
 *** src/src/libscotch/arch_cmplt.h	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_cmplt.h	2010-04-30 10:28:22.098131044 -0700
+--- new4/src/libscotch/arch_cmplt.h	2010-05-03 15:37:55.118089860 -0700
 ***************
 *** 87,93 ****
@@ -137,7 +137,7 @@
   #define archCmpltArchFree           NULL
   ArchDomNum                  archCmpltDomNum     (const ArchCmplt * const, const ArchCmpltDom * const);
-diff -rc src/src/libscotch/arch_cmpltw.c new3/src/libscotch/arch_cmpltw.c
+diff -rc src/src/libscotch/arch_cmpltw.c new4/src/libscotch/arch_cmpltw.c
 *** src/src/libscotch/arch_cmpltw.c	2008-08-27 14:22:22.000000000 -0700
---- new3/src/libscotch/arch_cmpltw.c	2010-04-30 10:28:22.103131046 -0700
+--- new4/src/libscotch/arch_cmpltw.c	2010-05-03 15:37:55.126089866 -0700
 ***************
 *** 200,211 ****
@@ -209,7 +209,7 @@
         return     (1);
       }
-diff -rc src/src/libscotch/arch_cmpltw.h new3/src/libscotch/arch_cmpltw.h
+diff -rc src/src/libscotch/arch_cmpltw.h new4/src/libscotch/arch_cmpltw.h
 *** src/src/libscotch/arch_cmpltw.h	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_cmpltw.h	2010-04-30 10:28:22.108131048 -0700
+--- new4/src/libscotch/arch_cmpltw.h	2010-05-03 15:37:55.133089872 -0700
 ***************
 *** 86,92 ****
@@ -226,7 +226,7 @@
   int                         archCmpltwArchFree  (ArchCmpltw * restrict const);
   ArchDomNum                  archCmpltwDomNum    (const ArchCmpltw * const, const ArchCmpltwDom * const);
-diff -rc src/src/libscotch/arch_deco.c new3/src/libscotch/arch_deco.c
+diff -rc src/src/libscotch/arch_deco.c new4/src/libscotch/arch_deco.c
 *** src/src/libscotch/arch_deco.c	2008-09-28 06:35:27.000000000 -0700
---- new3/src/libscotch/arch_deco.c	2010-04-30 10:28:22.153131068 -0700
+--- new4/src/libscotch/arch_deco.c	2010-05-03 15:37:55.180089911 -0700
 ***************
 *** 211,217 ****
@@ -267,7 +267,7 @@
     if ((sizeof (ArchDeco)    > sizeof (ArchDummy)) ||
         (sizeof (ArchDecoDom) > sizeof (ArchDomDummy))) {
-diff -rc src/src/libscotch/arch_deco.h new3/src/libscotch/arch_deco.h
+diff -rc src/src/libscotch/arch_deco.h new4/src/libscotch/arch_deco.h
 *** src/src/libscotch/arch_deco.h	2008-09-27 07:49:46.000000000 -0700
---- new3/src/libscotch/arch_deco.h	2010-04-30 10:28:22.158131070 -0700
+--- new4/src/libscotch/arch_deco.h	2010-05-03 15:37:55.187089917 -0700
 ***************
 *** 113,119 ****
@@ -284,7 +284,7 @@
   int                         archDecoArchFree    (ArchDeco * const);
   Anum                        archDecoArchSize    (ArchDeco * const, const Anum);
-diff -rc src/src/libscotch/arch.h new3/src/libscotch/arch.h
+diff -rc src/src/libscotch/arch.h new4/src/libscotch/arch.h
 *** src/src/libscotch/arch.h	2009-04-28 08:11:27.000000000 -0700
---- new3/src/libscotch/arch.h	2010-04-30 10:28:22.163131072 -0700
+--- new4/src/libscotch/arch.h	2010-05-03 15:37:55.194089922 -0700
 ***************
 *** 175,181 ****
@@ -301,7 +301,7 @@
   char *                      archName            (const Arch * const);
   const ArchClass *           archClass           (const char * const);
-diff -rc src/src/libscotch/arch_hcub.c new3/src/libscotch/arch_hcub.c
+diff -rc src/src/libscotch/arch_hcub.c new4/src/libscotch/arch_hcub.c
 *** src/src/libscotch/arch_hcub.c	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_hcub.c	2010-04-30 10:28:22.169131075 -0700
+--- new4/src/libscotch/arch_hcub.c	2010-05-03 15:37:55.201089928 -0700
 ***************
 *** 88,95 ****
@@ -349,7 +349,7 @@
       errorPrint ("archHcubArchLoad: bad input");
       return     (1);
-diff -rc src/src/libscotch/arch_hcub.h new3/src/libscotch/arch_hcub.h
+diff -rc src/src/libscotch/arch_hcub.h new4/src/libscotch/arch_hcub.h
 *** src/src/libscotch/arch_hcub.h	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_hcub.h	2010-04-30 10:28:22.174131077 -0700
+--- new4/src/libscotch/arch_hcub.h	2010-05-03 15:37:55.208089934 -0700
 ***************
 *** 85,91 ****
@@ -366,7 +366,7 @@
   #define archHcubArchFree            NULL
   ArchDomNum                  archHcubDomNum      (const ArchHcub * const, const ArchHcubDom * const);
-diff -rc src/src/libscotch/arch_mesh.c new3/src/libscotch/arch_mesh.c
+diff -rc src/src/libscotch/arch_mesh.c new4/src/libscotch/arch_mesh.c
 *** src/src/libscotch/arch_mesh.c	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_mesh.c	2010-04-30 10:28:22.179131079 -0700
+--- new4/src/libscotch/arch_mesh.c	2010-05-03 15:37:55.215089940 -0700
 ***************
 *** 96,103 ****
@@ -465,7 +465,7 @@
       return     (1);
     }
-diff -rc src/src/libscotch/arch_mesh.h new3/src/libscotch/arch_mesh.h
+diff -rc src/src/libscotch/arch_mesh.h new4/src/libscotch/arch_mesh.h
 *** src/src/libscotch/arch_mesh.h	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_mesh.h	2010-04-30 10:28:22.184131082 -0700
+--- new4/src/libscotch/arch_mesh.h	2010-05-03 15:37:55.221089945 -0700
 ***************
 *** 96,102 ****
@@ -496,7 +496,7 @@
   #define archMesh3ArchFree           NULL
   ArchDomNum                  archMesh3DomNum     (const ArchMesh3 * const, const ArchMesh3Dom * const);
-diff -rc src/src/libscotch/arch_tleaf.c new3/src/libscotch/arch_tleaf.c
+diff -rc src/src/libscotch/arch_tleaf.c new4/src/libscotch/arch_tleaf.c
 *** src/src/libscotch/arch_tleaf.c	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_tleaf.c	2010-04-30 10:28:22.189131084 -0700
+--- new4/src/libscotch/arch_tleaf.c	2010-05-03 15:37:55.228089950 -0700
 ***************
 *** 92,99 ****
@@ -554,7 +554,7 @@
       return     (1);
     }
-diff -rc src/src/libscotch/arch_tleaf.h new3/src/libscotch/arch_tleaf.h
+diff -rc src/src/libscotch/arch_tleaf.h new4/src/libscotch/arch_tleaf.h
 *** src/src/libscotch/arch_tleaf.h	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_tleaf.h	2010-04-30 10:28:22.194131086 -0700
+--- new4/src/libscotch/arch_tleaf.h	2010-05-03 15:37:55.235089956 -0700
 ***************
 *** 89,95 ****
@@ -571,7 +571,7 @@
   #define archTleafArchFree           NULL
   ArchDomNum                  archTleafDomNum     (const ArchTleaf * const, const ArchTleafDom * const);
-diff -rc src/src/libscotch/arch_torus.c new3/src/libscotch/arch_torus.c
+diff -rc src/src/libscotch/arch_torus.c new4/src/libscotch/arch_torus.c
 *** src/src/libscotch/arch_torus.c	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_torus.c	2010-04-30 10:28:22.199131088 -0700
+--- new4/src/libscotch/arch_torus.c	2010-05-03 15:37:55.242089962 -0700
 ***************
 *** 90,97 ****
@@ -670,7 +670,7 @@
       return     (1);
     }
-diff -rc src/src/libscotch/arch_torus.h new3/src/libscotch/arch_torus.h
+diff -rc src/src/libscotch/arch_torus.h new4/src/libscotch/arch_torus.h
 *** src/src/libscotch/arch_torus.h	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/arch_torus.h	2010-04-30 10:28:22.204131090 -0700
+--- new4/src/libscotch/arch_torus.h	2010-05-03 15:37:55.248089967 -0700
 ***************
 *** 96,102 ****
@@ -701,7 +701,7 @@
   #define archTorus3ArchFree          NULL
   ArchDomNum                  archTorus3DomNum    (const ArchTorus3 * const, const ArchTorus3Dom * const);
-diff -rc src/src/libscotch/common.c new3/src/libscotch/common.c
+diff -rc src/src/libscotch/common.c new4/src/libscotch/common.c
 *** src/src/libscotch/common.c	2008-05-22 06:44:41.000000000 -0700
---- new3/src/libscotch/common.c	2010-04-30 10:28:22.209131092 -0700
+--- new4/src/libscotch/common.c	2010-05-03 15:37:55.254089972 -0700
 ***************
 *** 100,106 ****
@@ -720,7 +720,7 @@
 + #endif /* MATLAB */
   }
-diff -rc src/src/libscotch/common.h new3/src/libscotch/common.h
+diff -rc src/src/libscotch/common.h new4/src/libscotch/common.h
 *** src/src/libscotch/common.h	2009-02-06 14:20:55.000000000 -0800
---- new3/src/libscotch/common.h	2010-05-03 14:22:16.763394855 -0700
+--- new4/src/libscotch/common.h	2010-05-03 15:37:55.261089978 -0700
 ***************
 *** 66,71 ****
@@ -766,7 +766,7 @@
   void                        intRandInit         (void);
   INT                         intRandVal          (INT);
-diff -rc src/src/libscotch/common_integer.c new3/src/libscotch/common_integer.c
+diff -rc src/src/libscotch/common_integer.c new4/src/libscotch/common_integer.c
 *** src/src/libscotch/common_integer.c	2009-01-21 01:32:32.000000000 -0800
---- new3/src/libscotch/common_integer.c	2010-05-03 14:21:44.014369358 -0700
+--- new4/src/libscotch/common_integer.c	2010-05-03 15:37:55.268089983 -0700
 ***************
 *** 191,196 ****
@@ -827,7 +827,7 @@
   
   /*********************/
-diff -rc src/src/libscotch/common_memory.c new3/src/libscotch/common_memory.c
+diff -rc src/src/libscotch/common_memory.c new4/src/libscotch/common_memory.c
 *** src/src/libscotch/common_memory.c	2009-01-03 02:16:11.000000000 -0800
---- new3/src/libscotch/common_memory.c	2010-04-30 10:28:22.224131099 -0700
+--- new4/src/libscotch/common_memory.c	2010-05-03 15:37:55.275089989 -0700
 ***************
 *** 87,93 ****
@@ -935,7 +935,7 @@
   }
   #endif /* COMMON_MEMORY_TRACE */
-diff -rc src/src/libscotch/dummysizes.c new3/src/libscotch/dummysizes.c
+diff -rc src/src/libscotch/dummysizes.c new4/src/libscotch/dummysizes.c
 *** src/src/libscotch/dummysizes.c	2009-05-09 16:08:02.000000000 -0700
---- new3/src/libscotch/dummysizes.c	2010-04-30 10:28:22.229131101 -0700
+--- new4/src/libscotch/dummysizes.c	2010-05-03 15:37:55.282089995 -0700
 ***************
 *** 267,271 ****
@@ -948,7 +948,7 @@
 + #endif /* MATLAB */
   }
-diff -rc src/src/libscotch/graph.c new3/src/libscotch/graph.c
+diff -rc src/src/libscotch/graph.c new4/src/libscotch/graph.c
 *** src/src/libscotch/graph.c	2008-05-22 06:44:42.000000000 -0700
---- new3/src/libscotch/graph.c	2010-04-30 10:28:22.234131103 -0700
+--- new4/src/libscotch/graph.c	2010-05-03 15:37:55.288090000 -0700
 ***************
 *** 135,141 ****
@@ -971,7 +971,7 @@
       if ((grafptr->edlotax != NULL) &&
           ((grafptr->flagval & GRAPHEDGEGROUP) == 0))
-diff -rc src/src/libscotch/graph.h new3/src/libscotch/graph.h
+diff -rc src/src/libscotch/graph.h new4/src/libscotch/graph.h
 *** src/src/libscotch/graph.h	2008-06-01 02:49:11.000000000 -0700
---- new3/src/libscotch/graph.h	2010-04-30 10:28:22.240131106 -0700
+--- new4/src/libscotch/graph.h	2010-05-03 15:37:55.295090006 -0700
 ***************
 *** 159,165 ****
@@ -988,7 +988,7 @@
   int                         graphSave           (const Graph * const, FILE * const);
   Gnum                        graphBase           (Graph * const, const Gnum);
-diff -rc src/src/libscotch/graph_io.c new3/src/libscotch/graph_io.c
+diff -rc src/src/libscotch/graph_io.c new4/src/libscotch/graph_io.c
 *** src/src/libscotch/graph_io.c	2008-05-22 06:44:42.000000000 -0700
---- new3/src/libscotch/graph_io.c	2010-04-30 10:28:22.245131108 -0700
+--- new4/src/libscotch/graph_io.c	2010-05-03 15:37:55.303090012 -0700
 ***************
 *** 86,92 ****
@@ -1226,7 +1226,7 @@
     }
   
-diff -rc src/src/libscotch/graph_io_scot.c new3/src/libscotch/graph_io_scot.c
+diff -rc src/src/libscotch/graph_io_scot.c new4/src/libscotch/graph_io_scot.c
 *** src/src/libscotch/graph_io_scot.c	2008-05-22 06:44:42.000000000 -0700
---- new3/src/libscotch/graph_io_scot.c	2010-04-30 10:28:22.251131111 -0700
+--- new4/src/libscotch/graph_io_scot.c	2010-05-03 15:37:55.310090018 -0700
 ***************
 *** 89,95 ****
@@ -1243,7 +1243,7 @@
     }
   
-diff -rc src/src/libscotch/library_arch.c new3/src/libscotch/library_arch.c
+diff -rc src/src/libscotch/library_arch.c new4/src/libscotch/library_arch.c
 *** src/src/libscotch/library_arch.c	2008-05-22 06:44:42.000000000 -0700
---- new3/src/libscotch/library_arch.c	2010-04-30 10:28:22.256131113 -0700
+--- new4/src/libscotch/library_arch.c	2010-05-03 15:37:55.317090024 -0700
 ***************
 *** 120,128 ****
@@ -1278,7 +1278,7 @@
   
   /*+ This routine saves the given opaque
-diff -rc src/src/libscotch/library_arch_f.c new3/src/libscotch/library_arch_f.c
+diff -rc src/src/libscotch/library_arch_f.c new4/src/libscotch/library_arch_f.c
 *** src/src/libscotch/library_arch_f.c	2008-05-22 06:44:42.000000000 -0700
---- new3/src/libscotch/library_arch_f.c	2010-04-30 10:28:22.260131115 -0700
+--- new4/src/libscotch/library_arch_f.c	2010-05-03 15:37:55.323090029 -0700
 ***************
 *** 121,127 ****
@@ -1295,7 +1295,7 @@
     fclose (stream);                                /* This closes filenum too */
   
-diff -rc src/src/libscotch/library_error_exit.c new3/src/libscotch/library_error_exit.c
+diff -rc src/src/libscotch/library_error_exit.c new4/src/libscotch/library_error_exit.c
 *** src/src/libscotch/library_error_exit.c	2009-01-20 00:36:33.000000000 -0800
---- new3/src/libscotch/library_error_exit.c	2010-04-30 10:28:22.265131117 -0700
+--- new4/src/libscotch/library_error_exit.c	2010-05-03 15:37:55.330090035 -0700
 ***************
 *** 114,119 ****
@@ -1370,7 +1370,7 @@
 + #endif /* MATLAB */
   }
-diff -rc src/src/libscotch/library_graph.c new3/src/libscotch/library_graph.c
+diff -rc src/src/libscotch/library_graph.c new4/src/libscotch/library_graph.c
 *** src/src/libscotch/library_graph.c	2008-05-22 07:28:12.000000000 -0700
---- new3/src/libscotch/library_graph.c	2010-04-30 10:28:22.270131119 -0700
+--- new4/src/libscotch/library_graph.c	2010-05-03 15:37:55.337090040 -0700
 ***************
 *** 137,143 ****
@@ -1415,7 +1415,7 @@
   
   /*+ This routine saves the contents of the given
-diff -rc src/src/libscotch/library_graph_f.c new3/src/libscotch/library_graph_f.c
+diff -rc src/src/libscotch/library_graph_f.c new4/src/libscotch/library_graph_f.c
 *** src/src/libscotch/library_graph_f.c	2008-05-22 06:44:43.000000000 -0700
---- new3/src/libscotch/library_graph_f.c	2010-04-30 10:28:22.275131121 -0700
+--- new4/src/libscotch/library_graph_f.c	2010-05-03 15:37:55.344090046 -0700
 ***************
 *** 136,142 ****
@@ -1432,7 +1432,7 @@
     fclose (stream);                                /* This closes filenum too */
   
-diff -rc src/src/libscotch/library_graph_map.c new3/src/libscotch/library_graph_map.c
+diff -rc src/src/libscotch/library_graph_map.c new4/src/libscotch/library_graph_map.c
 *** src/src/libscotch/library_graph_map.c	2008-09-28 04:04:05.000000000 -0700
---- new3/src/libscotch/library_graph_map.c	2010-04-30 10:28:22.280131123 -0700
+--- new4/src/libscotch/library_graph_map.c	2010-05-03 15:37:55.350090051 -0700
 ***************
 *** 182,192 ****
@@ -1457,7 +1457,7 @@
   
   /*+ This routine computes a mapping
-diff -rc src/src/libscotch/library_graph_map_f.c new3/src/libscotch/library_graph_map_f.c
+diff -rc src/src/libscotch/library_graph_map_f.c new4/src/libscotch/library_graph_map_f.c
 *** src/src/libscotch/library_graph_map_f.c	2008-06-28 03:44:26.000000000 -0700
---- new3/src/libscotch/library_graph_map_f.c	2010-04-30 10:28:22.285131126 -0700
+--- new4/src/libscotch/library_graph_map_f.c	2010-05-03 15:37:55.357090057 -0700
 ***************
 *** 183,189 ****
@@ -1474,7 +1474,7 @@
     fclose (stream);                                /* This closes filenum too */
   
-diff -rc src/src/libscotch/library.h new3/src/libscotch/library.h
+diff -rc src/src/libscotch/library.h new4/src/libscotch/library.h
 *** src/src/libscotch/library.h	2009-05-09 16:08:03.000000000 -0700
---- new3/src/libscotch/library.h	2010-04-30 10:28:22.291131128 -0700
+--- new4/src/libscotch/library.h	2010-05-03 15:37:55.365090063 -0700
 ***************
 *** 134,140 ****
@@ -1519,7 +1519,7 @@
   int                         SCOTCH_graphMapCompute (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Strat * const);
   int                         SCOTCH_graphMap     (const SCOTCH_Graph * const, const SCOTCH_Arch * const, const SCOTCH_Strat * const, SCOTCH_Num * const);
-diff -rc src/src/libscotch/Makefile new3/src/libscotch/Makefile
+diff -rc src/src/libscotch/Makefile new4/src/libscotch/Makefile
 *** src/src/libscotch/Makefile	2009-05-09 16:08:04.000000000 -0700
---- new3/src/libscotch/Makefile	2010-04-30 10:28:22.297131131 -0700
+--- new4/src/libscotch/Makefile	2010-06-17 09:55:33.101320246 -0700
 ***************
 *** 49,55 ****
@@ -1551,14 +1551,211 @@
 + 					scotch.h						\
 + 					scotchf.h						\
-+ 					libscotch$(LIB)						\
-+ 					libscotcherr$(LIB)					\
-+ 					libscotcherrexit$(LIB)
++ 					libmexscotch$(LIB)						\
++ 					libmexscotcherr$(LIB)					\
++ 					libmexscotcherrexit$(LIB)
 + 
   install				:
   					-$(CP) scotch.h scotchf.h $(includedir)
   					-$(CP) libscotch$(LIB) libscotcherr*$(LIB) $(libdir)
-diff -rc src/src/libscotch/mapping.h new3/src/libscotch/mapping.h
+***************
+*** 77,82 ****
+--- 87,96 ----
+  					-$(CP) scotchf.h $(includedir)/ptscotchf.h
+  					-$(CP) libptscotch*$(LIB) $(libdir)
+  
++ mexinstall				:
++ 					-$(CP) scotch.h scotchf.h $(includedir)
++ 					-$(CP) libmexscotch$(LIB) libmexscotcherr*$(LIB) $(libdir)
++ 
+  clean				:
+  					-$(RM) *~ *$(OBJ) lib*$(LIB) common2* parser_yy.c parser_ly.h parser_ll.c *scotch.h *scotchf.h y.output dummysizes$(EXE)
+  
+***************
+*** 2452,2457 ****
+--- 2466,2632 ----
+  					$(AR) $(ARFLAGS) lib$(SCOTCHLIB)$(LIB) $(?)
+  					-$(RANLIB) lib$(SCOTCHLIB)$(LIB)
+  
++ libmexscotch$(LIB)			:	arch$(OBJ)				\
++ 					arch_build$(OBJ)			\
++ 					arch_cmplt$(OBJ)			\
++ 					arch_cmpltw$(OBJ)			\
++ 					arch_deco$(OBJ)				\
++ 					arch_hcub$(OBJ)				\
++ 					arch_mesh$(OBJ)				\
++ 					arch_tleaf$(OBJ)			\
++ 					arch_torus$(OBJ)			\
++ 					arch_vcmplt$(OBJ)			\
++ 					arch_vhcub$(OBJ)			\
++ 					bgraph$(OBJ)				\
++ 					bgraph_bipart_bd$(OBJ)			\
++ 					bgraph_bipart_df$(OBJ)			\
++ 					bgraph_bipart_ex$(OBJ)			\
++ 					bgraph_bipart_fm$(OBJ)			\
++ 					bgraph_bipart_gg$(OBJ)			\
++ 					bgraph_bipart_gp$(OBJ)			\
++ 					bgraph_bipart_ml$(OBJ)			\
++ 					bgraph_bipart_st$(OBJ)			\
++ 					bgraph_bipart_zr$(OBJ)			\
++ 					bgraph_check$(OBJ)			\
++ 					bgraph_store$(OBJ)			\
++ 					common$(OBJ)				\
++ 					common_file$(OBJ)			\
++ 					common_file_compress$(OBJ)		\
++ 					common_file_uncompress$(OBJ)		\
++ 					common_integer$(OBJ)			\
++ 					common_memory$(OBJ)			\
++ 					common_stub$(OBJ)			\
++ 					gain$(OBJ)				\
++ 					geom$(OBJ)				\
++ 					graph$(OBJ)				\
++ 					graph_base$(OBJ)			\
++ 					graph_check$(OBJ)			\
++ 					graph_coarsen$(OBJ)			\
++ 					graph_induce$(OBJ)			\
++ 					graph_io$(OBJ)				\
++ 					graph_io_chac$(OBJ)			\
++ 					graph_io_habo$(OBJ)			\
++ 					graph_io_mmkt$(OBJ)			\
++ 					graph_io_scot$(OBJ)			\
++ 					graph_list$(OBJ)			\
++ 					hall_order_hd$(OBJ)			\
++ 					hall_order_hf$(OBJ)			\
++ 					hall_order_hx$(OBJ)			\
++ 					hgraph$(OBJ)				\
++ 					hgraph_check$(OBJ)			\
++ 					hgraph_induce$(OBJ)			\
++ 					hgraph_order_bl$(OBJ)			\
++ 					hgraph_order_cp$(OBJ)			\
++ 					hgraph_order_gp$(OBJ)			\
++ 					hgraph_order_hd$(OBJ)			\
++ 					hgraph_order_hf$(OBJ)			\
++ 					hgraph_order_hx$(OBJ)			\
++ 					hgraph_order_nd$(OBJ)			\
++ 					hgraph_order_si$(OBJ)			\
++ 					hgraph_order_st$(OBJ)			\
++ 					hmesh$(OBJ)				\
++ 					hmesh_check$(OBJ)			\
++ 					hmesh_hgraph$(OBJ)			\
++ 					hmesh_induce$(OBJ)			\
++ 					hmesh_mesh$(OBJ)			\
++ 					hmesh_order_bl$(OBJ)			\
++ 					hmesh_order_cp$(OBJ)			\
++ 					hmesh_order_gr$(OBJ)			\
++ 					hmesh_order_gp$(OBJ)			\
++ 					hmesh_order_hd$(OBJ)			\
++ 					hmesh_order_hf$(OBJ)			\
++ 					hmesh_order_hx$(OBJ)			\
++ 					hmesh_order_nd$(OBJ)			\
++ 					hmesh_order_si$(OBJ)			\
++ 					hmesh_order_st$(OBJ)			\
++ 					kgraph$(OBJ)				\
++ 					kgraph_map_rb$(OBJ)			\
++ 					kgraph_map_rb_map$(OBJ)			\
++ 					kgraph_map_rb_part$(OBJ)		\
++ 					kgraph_map_st$(OBJ)			\
++ 					library_arch$(OBJ)			\
++ 					library_arch_f$(OBJ)			\
++ 					library_arch_build$(OBJ)		\
++ 					library_arch_build_f$(OBJ)		\
++ 					library_arch_cmpltw$(OBJ)		\
++ 					library_arch_cmpltw_f$(OBJ)		\
++ 					library_geom$(OBJ)			\
++ 					library_geom_f$(OBJ)			\
++ 					library_graph$(OBJ)			\
++ 					library_graph_f$(OBJ)			\
++ 					library_graph_base$(OBJ)		\
++ 					library_graph_base_f$(OBJ)		\
++ 					library_graph_check$(OBJ)		\
++ 					library_graph_check_f$(OBJ)		\
++ 					library_graph_io_chac$(OBJ)		\
++ 					library_graph_io_chac_f$(OBJ)		\
++ 					library_graph_io_habo$(OBJ)		\
++ 					library_graph_io_habo_f$(OBJ)		\
++ 					library_graph_io_mmkt$(OBJ)		\
++ 					library_graph_io_mmkt_f$(OBJ)		\
++ 					library_graph_io_scot$(OBJ)		\
++ 					library_graph_io_scot_f$(OBJ)		\
++ 					library_graph_map$(OBJ)			\
++ 					library_graph_map_f$(OBJ)		\
++ 					library_graph_map_view$(OBJ)		\
++ 					library_graph_map_view_f$(OBJ)		\
++ 					library_graph_order$(OBJ)		\
++ 					library_graph_order_f$(OBJ)		\
++ 					library_mesh$(OBJ)			\
++ 					library_mesh_f$(OBJ)			\
++ 					library_mesh_graph$(OBJ)		\
++ 					library_mesh_graph_f$(OBJ)		\
++ 					library_mesh_io_habo$(OBJ)		\
++ 					library_mesh_io_habo_f$(OBJ)		\
++ 					library_mesh_io_scot$(OBJ)		\
++ 					library_mesh_io_scot_f$(OBJ)		\
++ 					library_mesh_order$(OBJ)		\
++ 					library_mesh_order_f$(OBJ)		\
++ 					library_parser$(OBJ)			\
++ 					library_parser_f$(OBJ)			\
++ 					library_random$(OBJ)			\
++ 					library_random_f$(OBJ)			\
++ 					mapping$(OBJ)				\
++ 					mapping_io$(OBJ)			\
++ 					mesh$(OBJ)				\
++ 					mesh_check$(OBJ)			\
++ 					mesh_coarsen$(OBJ)			\
++ 					mesh_graph$(OBJ)			\
++ 					mesh_induce_sepa$(OBJ)			\
++ 					mesh_io$(OBJ)				\
++ 					mesh_io_habo$(OBJ)			\
++ 					mesh_io_scot$(OBJ)			\
++ 					order$(OBJ)				\
++ 					order_check$(OBJ)			\
++ 					order_io$(OBJ)				\
++ 					parser$(OBJ)				\
++ 					parser_ll$(OBJ)				\
++ 					parser_yy$(OBJ)				\
++ 					vgraph$(OBJ)				\
++ 					vgraph_check$(OBJ)			\
++ 					vgraph_separate_bd$(OBJ)		\
++ 					vgraph_separate_es$(OBJ)		\
++ 					vgraph_separate_fm$(OBJ)		\
++ 					vgraph_separate_gg$(OBJ)		\
++ 					vgraph_separate_gp$(OBJ)		\
++ 					vgraph_separate_ml$(OBJ)		\
++ 					vgraph_separate_st$(OBJ)		\
++ 					vgraph_separate_th$(OBJ)		\
++ 					vgraph_separate_vw$(OBJ)		\
++ 					vgraph_separate_zr$(OBJ)		\
++ 					vgraph_store$(OBJ)			\
++ 					vmesh$(OBJ)				\
++ 					vmesh_check$(OBJ)			\
++ 					vmesh_separate_fm$(OBJ)			\
++ 					vmesh_separate_gg$(OBJ)			\
++ 					vmesh_separate_gr$(OBJ)			\
++ 					vmesh_separate_ml$(OBJ)			\
++ 					vmesh_separate_zr$(OBJ)			\
++ 					vmesh_separate_st$(OBJ)			\
++ 					vmesh_store$(OBJ)
++ 					$(AR) $(ARFLAGS) $(@) $(?)
++ 					-$(RANLIB) $(@)
++ 
+  libptscotcherr$(LIB)		:	library_error$(OBJ)
+  					$(AR) $(ARFLAGS) $(@) $(?)
+  					-$(RANLIB) $(@)
+***************
+*** 2467,2469 ****
+--- 2642,2651 ----
+  libscotcherrexit$(LIB)		:	library_error_exit$(OBJ)
+  					$(AR) $(ARFLAGS) $(@) $(?)
+  					-$(RANLIB) $(@)
++ libmexscotcherr$(LIB)		:	library_error$(OBJ)
++ 					$(AR) $(ARFLAGS) $(@) $(?)
++ 					-$(RANLIB) $(@)
++ 
++ libmexscotcherrexit$(LIB)		:	library_error_exit$(OBJ)
++ 					$(AR) $(ARFLAGS) $(@) $(?)
++ 					-$(RANLIB) $(@)
+Only in new4/src/libscotch: Makefile_save
+diff -rc src/src/libscotch/mapping.h new4/src/libscotch/mapping.h
 *** src/src/libscotch/mapping.h	2008-10-27 08:27:47.000000000 -0700
---- new3/src/libscotch/mapping.h	2010-04-30 10:28:22.302131133 -0700
+--- new4/src/libscotch/mapping.h	2010-05-03 15:37:55.381090077 -0700
 ***************
 *** 106,112 ****
@@ -1575,7 +1772,7 @@
   
   #undef static
-diff -rc src/src/libscotch/mapping_io.c new3/src/libscotch/mapping_io.c
+diff -rc src/src/libscotch/mapping_io.c new4/src/libscotch/mapping_io.c
 *** src/src/libscotch/mapping_io.c	2008-05-22 06:44:43.000000000 -0700
---- new3/src/libscotch/mapping_io.c	2010-04-30 10:28:22.307131135 -0700
+--- new4/src/libscotch/mapping_io.c	2010-05-03 15:37:55.388090082 -0700
 ***************
 *** 199,204 ****
@@ -1664,7 +1861,7 @@
     return (0);
   }
-diff -rc src/src/libscotch/mesh_io_scot.c new3/src/libscotch/mesh_io_scot.c
+diff -rc src/src/libscotch/mesh_io_scot.c new4/src/libscotch/mesh_io_scot.c
 *** src/src/libscotch/mesh_io_scot.c	2008-05-22 06:44:43.000000000 -0700
---- new3/src/libscotch/mesh_io_scot.c	2010-04-30 10:28:22.312131137 -0700
+--- new4/src/libscotch/mesh_io_scot.c	2010-05-03 15:37:55.394090087 -0700
 ***************
 *** 85,91 ****
@@ -1681,7 +1878,7 @@
     }
   
-diff -rc src/src/libscotch/module.h new3/src/libscotch/module.h
+diff -rc src/src/libscotch/module.h new4/src/libscotch/module.h
 *** src/src/libscotch/module.h	2009-04-26 23:07:14.000000000 -0700
---- new3/src/libscotch/module.h	2010-05-03 14:48:29.655638124 -0700
+--- new4/src/libscotch/module.h	2010-05-03 15:37:55.402090094 -0700
 ***************
 *** 156,161 ****
@@ -1694,7 +1891,7 @@
   #define intRandInit                 _SCOTCHintRandInit
   /* #define intRandVal               _SCOTCHintRandVal Already a macro */
-diff -rc src/src/libscotch/parser_ll.l new3/src/libscotch/parser_ll.l
+diff -rc src/src/libscotch/parser_ll.l new4/src/libscotch/parser_ll.l
 *** src/src/libscotch/parser_ll.l	2008-05-22 06:44:43.000000000 -0700
---- new3/src/libscotch/parser_ll.l	2010-04-30 10:28:22.318131140 -0700
+--- new4/src/libscotch/parser_ll.l	2010-05-03 15:37:55.410090101 -0700
 ***************
 *** 192,197 ****
@@ -1723,7 +1920,7 @@
     yyrestart (yyin);                               /* (Re-)initialize the parser */
   #endif /* FLEX_SCANNER */
-diff -rc src/src/libscotch/parser_yy.y new3/src/libscotch/parser_yy.y
+diff -rc src/src/libscotch/parser_yy.y new4/src/libscotch/parser_yy.y
 *** src/src/libscotch/parser_yy.y	2008-10-22 15:12:48.000000000 -0700
---- new3/src/libscotch/parser_yy.y	2010-04-30 10:28:22.363131160 -0700
+--- new4/src/libscotch/parser_yy.y	2010-05-03 15:37:55.418090107 -0700
 ***************
 *** 774,779 ****
@@ -1736,7 +1933,7 @@
     if (stratParserParse2 () != 0) {                /* Parse the strategy string */
       if (parserstratcurr != NULL)
-diff -rc src/src/libscotch/vgraph_separate_vw.c new3/src/libscotch/vgraph_separate_vw.c
+diff -rc src/src/libscotch/vgraph_separate_vw.c new4/src/libscotch/vgraph_separate_vw.c
 *** src/src/libscotch/vgraph_separate_vw.c	2008-05-22 06:44:43.000000000 -0700
---- new3/src/libscotch/vgraph_separate_vw.c	2010-04-30 10:28:22.368131162 -0700
+--- new4/src/libscotch/vgraph_separate_vw.c	2010-05-03 15:37:55.425090113 -0700
 ***************
 *** 83,88 ****
@@ -1758,7 +1955,7 @@
     return (0);
   }
-diff -rc src/src/Makefile new3/src/Makefile
+diff -rc src/src/Makefile new4/src/Makefile
 *** src/src/Makefile	2008-09-15 05:50:51.000000000 -0700
---- new3/src/Makefile	2010-04-30 10:28:22.373131164 -0700
+--- new4/src/Makefile	2010-06-17 09:31:54.881418932 -0700
 ***************
 *** 97,102 ****
@@ -1768,5 +1965,5 @@
   
 + mexscotch			:	required
-+ 					(cd libscotch ;      $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) install)
++ 					(cd libscotch ;      $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) mexinstall)
 + 					(cd scotch ;         $(MAKE) VERSION=\"$(VERSION)\" mexscotch && $(MAKE) mexinstall)
 + 
@@ -1774,10 +1971,10 @@
   					-$(CP) -f ../bin/[agm]*$(EXE) $(bindir)
   					-$(CP) -f ../include/*scotch*.h $(includedir)
-Only in new3/src: Makefile.inc
-Only in new3/src/scotch: gmap_mex.c
-Only in new3/src/scotch: gmapx.c
-diff -rc src/src/scotch/Makefile new3/src/scotch/Makefile
+Only in new4/src: Makefile.inc
+Only in new4/src/scotch: gmap_mex.c
+Only in new4/src/scotch: gmapx.c
+diff -rc src/src/scotch/Makefile new4/src/scotch/Makefile
 *** src/src/scotch/Makefile	2009-04-27 02:19:43.000000000 -0700
---- new3/src/scotch/Makefile	2010-04-30 10:28:22.379131167 -0700
+--- new4/src/scotch/Makefile	2010-06-17 10:09:39.718475100 -0700
 ***************
 *** 49,59 ****
@@ -1825,5 +2022,5 @@
 ***************
 *** 104,111 ****
---- 113,124 ----
+--- 113,126 ----
   					-$(RM) $(bindir)/dgpart$(EXE)
   					-$(LN) $(bindir)/dgmap$(EXE) $(bindir)/dgpart$(EXE)
@@ -1831,4 +2028,6 @@
 + mexinstall			:
 + 					-$(CP) gmap_mex$(MEX) $(bindir)
++ 					-$(RM) $(bindir)/gpart_mex$(MEX)
++ 					-$(LN) $(bindir)/gmap_mex$(MEX) $(bindir)/gpart_mex$(MEX)
 + 
   clean				:
@@ -1840,5 +2039,5 @@
 ***************
 *** 365,367 ****
---- 378,396 ----
+--- 380,403 ----
   					$(libdir)/libscotch$(LIB)		\
   					$(libdir)/libscotcherrexit$(LIB)	\
@@ -1860,2 +2059,7 @@
 + 					$(libdir)/libscotcherrexit$(LIB)	\
 + 					gmap.h
++ 
++ gpart_mex$(MEX)			:	gmap_mex$(MEX)
++ 					-$(RM) gpart_mex$(MEX)
++ 					-$(LN) gmap_mex$(MEX) gpart_mex$(MEX)
++ 
