diff -r -u -N CLAPACK-3.2.1-orig/INSTALL/Makefile CLAPACK-3.2.1/INSTALL/Makefile
--- CLAPACK-3.2.1-orig/INSTALL/Makefile	2009-06-09 18:41:11.000000000 +0200
+++ CLAPACK-3.2.1/INSTALL/Makefile	2010-03-14 23:17:55.000000000 +0100
@@ -1,5 +1,4 @@
 include ../make.inc
-F2CLIB       = ../F2CLIBS/libf2c.a
 
 .SUFFIXES : .o .c 
 all:  testlsame testslamch testdlamch testsecond testdsecnd testieee testversion 
diff -r -u -N CLAPACK-3.2.1-orig/SRC/Makefile CLAPACK-3.2.1/SRC/Makefile
--- CLAPACK-3.2.1-orig/SRC/Makefile	2009-06-09 18:41:11.000000000 +0200
+++ CLAPACK-3.2.1/SRC/Makefile	2010-03-14 23:17:55.000000000 +0100
@@ -357,7 +357,7 @@
    zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o		\
    zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
 
-all: ../$(LAPACKLIB)
+all: ../$(LAPACKLIB) ../$(LAPACKSOLIB)
 
 ifdef USEXBLAS
 ALLXOBJ=$(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) $(ALLXAUX)
@@ -370,6 +370,10 @@
 	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
 	$(RANLIB) $@
 
+../$(LAPACKSOLIB): $(ALLOBJ) $(ALLXOBJ)
+	$(ARCHSO) -o $@ $(SOFLAGS) $(ALLOBJ) $(ALLXOBJ)
+
+
 single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
 	$(SCLAUX)
diff -r -u -N CLAPACK-3.2.1-orig/TESTING/MATGEN/Makefile CLAPACK-3.2.1/TESTING/MATGEN/Makefile
--- CLAPACK-3.2.1-orig/TESTING/MATGEN/Makefile	2009-06-09 18:41:11.000000000 +0200
+++ CLAPACK-3.2.1/TESTING/MATGEN/Makefile	2010-03-15 00:18:30.000000000 +0100
@@ -59,8 +59,8 @@
 	$(DZATGEN)
 
 ../../$(TMGLIB): $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN)	\
-		$(ZMATGEN) $(DZATGEN)
-	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
+		$(ZMATGEN) $(DZATGEN) i_len_trim.o i_ceiling.o
+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) i_len_trim.o i_ceiling.o
 	$(RANLIB) $@
 
 single: $(SMATGEN) $(SCATGEN)
diff -r -u -N CLAPACK-3.2.1-orig/TESTING/MATGEN/i_ceiling.c CLAPACK-3.2.1/TESTING/MATGEN/i_ceiling.c
--- CLAPACK-3.2.1-orig/TESTING/MATGEN/i_ceiling.c	1970-01-01 01:00:00.000000000 +0100
+++ CLAPACK-3.2.1/TESTING/MATGEN/i_ceiling.c	2010-03-15 00:17:54.000000000 +0100
@@ -0,0 +1,36 @@
+#include "f2c.h"
+
+#ifdef KR_headers
+integer i_sceiling(x) real *x;
+#else
+#ifdef __cplusplus
+extern "C" {
+#endif
+integer i_sceiling(real *x)
+#endif
+{
+#define CEIL(x) ((int)(x) + ((x) > 0 && (x) != (int)(x)))
+
+    return (integer) CEIL(*x);
+}
+#ifdef __cplusplus
+}
+#endif
+
+
+#ifdef KR_headers
+integer i_dceiling(x) doublereal *x;
+#else
+#ifdef __cplusplus
+extern "C" {
+#endif
+integer i_dceiling(doublereal *x)
+#endif
+{
+#define CEIL(x) ((int)(x) + ((x) > 0 && (x) != (int)(x)))
+
+    return (integer) CEIL(*x);
+}
+#ifdef __cplusplus
+}
+#endif
diff -r -u -N CLAPACK-3.2.1-orig/TESTING/MATGEN/i_len_trim.c CLAPACK-3.2.1/TESTING/MATGEN/i_len_trim.c
--- CLAPACK-3.2.1-orig/TESTING/MATGEN/i_len_trim.c	1970-01-01 01:00:00.000000000 +0100
+++ CLAPACK-3.2.1/TESTING/MATGEN/i_len_trim.c	2010-03-15 00:11:28.000000000 +0100
@@ -0,0 +1,24 @@
+/* file has been copied from the included f2c library - dilfridge */
+
+#include "f2c.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef KR_headers
+integer i_len_trim(s, n) char *s; ftnlen n;
+#else
+integer i_len_trim(char *s, ftnlen n)
+#endif
+{
+  int i;
+
+  for(i=n-1;i>=0;i--)
+    if(s[i] != ' ')
+      return i + 1;
+
+  return(0);
+}
+#ifdef __cplusplus
+}
+#endif
diff -r -u -N CLAPACK-3.2.1-orig/TESTING/Makefile CLAPACK-3.2.1/TESTING/Makefile
--- CLAPACK-3.2.1-orig/TESTING/Makefile	2009-06-09 18:41:11.000000000 +0200
+++ CLAPACK-3.2.1/TESTING/Makefile	2010-03-14 23:17:55.000000000 +0100
@@ -37,11 +37,6 @@
 
 include ../make.inc
 
-ifneq ($(strip $(VARLIB)),)
-    LAPACKLIB :=  $(VARLIB) ../$(LAPACKLIB)
-endif
-
-
 all:     single complex double complex16 singleproto doubleproto complexproto complex16proto
 
 SEIGTST= snep.out \
diff -r -u -N CLAPACK-3.2.1-orig/make.inc.example CLAPACK-3.2.1/make.inc.example
--- CLAPACK-3.2.1-orig/make.inc.example	2009-06-25 19:41:21.000000000 +0200
+++ CLAPACK-3.2.1/make.inc.example	2010-03-14 23:17:55.000000000 +0100
@@ -53,6 +53,10 @@
 ARCH     = ar
 ARCHFLAGS= cr
 RANLIB   = ranlib
+
+ARCHSO     = gcc -shared
+SOFLAGS    =
+ 
 #
 #  The location of BLAS library for linking the testing programs.
 #  The target's machine-specific, optimized BLAS library should be
@@ -72,6 +76,7 @@
 #  Names of generated libraries.
 #
 LAPACKLIB    = lapack$(PLAT).a
+LAPACKSOLIB  = libclapack.so
 F2CLIB       = ../../F2CLIBS/libf2c.a
 TMGLIB       = tmglib$(PLAT).a
 EIGSRCLIB    = eigsrc$(PLAT).a