diff -Nru ATLAS.orig/CONFIG/src/Makefile ATLAS/CONFIG/src/Makefile
--- ATLAS.orig/CONFIG/src/Makefile	2006-08-22 17:17:18.000000000 +0200
+++ ATLAS/CONFIG/src/Makefile	2006-08-28 21:59:42.000000000 +0200
@@ -302,6 +302,18 @@
 	$(MAKE) -f Make.top sanity_test
 pttest :
 	$(MAKE) -f Make.top ptsanity_test
+shared :
+	$(MAKE) -f Make.top shared arch=$(arch)
+shared-strip :
+	$(MAKE) -f Make.top shared-strip arch=$(arch)
+ptshared :
+	$(MAKE) -f Make.top ptshared arch=$(arch)
+ptshared-strip :
+	$(MAKE) -f Make.top ptshared-strip arch=$(arch)
+liblapack.so :
+	$(MAKE) -f Make.top liblapack.so arch=$(arch)
+
+
 $(INCINSTdir) :
 	mkdir -p $(INCINSTdir)
 	chmod 0755 $(INCINSTdir)
diff -Nru ATLAS.orig/CONFIG/src/SpewMakeInc.c ATLAS/CONFIG/src/SpewMakeInc.c
--- ATLAS.orig/CONFIG/src/SpewMakeInc.c	2006-08-22 17:17:18.000000000 +0200
+++ ATLAS/CONFIG/src/SpewMakeInc.c	2006-08-28 21:59:42.000000000 +0200
@@ -434,7 +434,7 @@
       fprintf(fpout, "   PTCBLASlib = $(LIBdir)/libptcblas.a\n");
       fprintf(fpout, "   PTF77BLASlib = $(LIBdir)/libptf77blas.a\n");
    }
-   fprintf(fpout, "   LAPACKlib = $(LIBdir)/liblapack.a\n");
+   fprintf(fpout, "   LAPACKlib = \n");
    fprintf(fpout, "   TESTlib = $(LIBdir)/libtstatlas.a\n\n");
 
    fprintf(fpout, "#  -------------------------------------------\n");
@@ -510,15 +510,18 @@
    fprintf(fpout, "\n\n");
    for (i=0; i < NCOMP; i++)
    {
-      fprintf(fpout, "   %s = %s\n", COMPNAME[i], comps[i]);
       if (i == F77_)
-         fprintf(fpout, "   %sFLAGS = %s\n", COMPNAME[i], comps[NCOMP+i]);
+	fprintf(fpout, "   %s = GENTOO_FORTRAN\n", COMPNAME[i]);
+      else 
+	fprintf(fpout, "   %s = GENTOO_GCC\n", COMPNAME[i]);
+      if (i == F77_)
+         fprintf(fpout, "   %sFLAGS = GENTOO_FFLAGS\n", COMPNAME[i]);
       else if (i == ICC_ || i == XCC_)
-         fprintf(fpout, "   %sFLAGS = $(CDEFS) %s\n",
-                 COMPNAME[i], comps[NCOMP+i]);
+         fprintf(fpout, "   %sFLAGS = $(CDEFS) GENTOO_CFLAGS\n",
+                 COMPNAME[i]);
       else /* non-interf comps don't include CDEFS by default (added later) */
-         fprintf(fpout, "   %sFLAGS = %s\n",
-                 COMPNAME[i], comps[NCOMP+i]);
+         fprintf(fpout, "   %sFLAGS = GENTOO_CFLAGS\n",
+                 COMPNAME[i]);
    }
    for (i=0; i < NCOMP; i++)
    {
@@ -529,14 +532,15 @@
          break;
    }
    if (j < NCOMP)
-      fprintf(fpout, "   GOODGCC = %s\n", comps[j]);
+      fprintf(fpout, "   GOODGCC = GENTOO_GCC\n");
    else
-      fprintf(fpout, "   GOODGCC = gcc\n");
+      fprintf(fpout, "   GOODGCC = GENTOO_GCC\n");
    fprintf(fpout, "   BC = $(ICC)\n");
    fprintf(fpout, "   NCFLAGS = $(ICCFLAGS)\n");
    fprintf(fpout, "\n   CLINKER = $(ICC)\n   CLINKFLAGS = $(ICCFLAGS)\n");
    fprintf(fpout, "   FLINKER = $(F77)\n   FLINKFLAGS = $(F77FLAGS)\n");
-   fprintf(fpout, "   ARCHIVER = ar\n");
+    fprintf(fpout, "   LIBTOOL = libtool --mode=compile\n");
+    fprintf(fpout, "   ARCHIVER = $(BLDdir)/war ar\n");
    fprintf(fpout, "   ARFLAGS  = r\n");
    fprintf(fpout, "   RANLIB   = echo\n\n");
 
diff -Nru ATLAS.orig/include/contrib/camm_dpa.h ATLAS/include/contrib/camm_dpa.h
--- ATLAS.orig/include/contrib/camm_dpa.h	2006-08-22 17:17:19.000000000 +0200
+++ ATLAS/include/contrib/camm_dpa.h	2006-08-28 21:59:42.000000000 +0200
@@ -1485,7 +1485,7 @@
     NO_INLINE
     unsigned u1=stride*sizeof(*fixm),u2=lda*sizeof(*a),u3=len*sizeof(*movm)/sizeof(float);
 
-    ASM (
+    ASM VOLATILE (
 
 	 "pushl %%ebx\n\t"
 	 a(4,sp)
diff -Nru ATLAS.orig/makes/Make.aux ATLAS/makes/Make.aux
--- ATLAS.orig/makes/Make.aux	2006-08-22 17:17:16.000000000 +0200
+++ ATLAS/makes/Make.aux	2006-08-28 21:59:42.000000000 +0200
@@ -1,6 +1,13 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/auxil
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+
 ptobj = ATL_ptflushcache.o
 obj = ATL_flushcache.o ATL_cputime.o ATL_walltime.o ATL_xerbla.o ATL_lcm.o \
       ATL_buildinfo.o ATL_sgemove.o ATL_sgecopy.o ATL_sgezero.o ATL_sgeadd.o \
@@ -114,12 +121,16 @@
 
 ATL_cputime.o : $(SYSdir)/ATL_cputime.o
 	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o
+	ln -sf $(SYSdir)/ATL_cputime.lo ATL_cputime.lo
+	ln -sf $(SYSdir)/.libs/ATL_cputime.o .libs/ATL_cputime.o
 $(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c
 	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
 $(SYSdir)/ATL_cputime.c:
 	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
 ATL_walltime.o : $(SYSdir)/ATL_walltime.o
 	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o
+	ln -sf $(SYSdir)/ATL_walltime.lo ATL_walltime.lo
+	ln -sf $(SYSdir)/.libs/ATL_walltime.o .libs/ATL_walltime.o
 $(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c
 	cd $(SYSdir) ; $(MAKE) ATL_walltime.o
 $(SYSdir)/ATL_walltime.c:
diff -Nru ATLAS.orig/makes/Make.bin ATLAS/makes/Make.bin
--- ATLAS.orig/makes/Make.bin	2006-08-22 17:17:16.000000000 +0200
+++ ATLAS/makes/Make.bin	2006-08-28 21:59:42.000000000 +0200
@@ -58,11 +58,11 @@
 	cd $(BLDdir)/src/blas/level3 ; $(MAKE) lib
 	cd $(BLDdir)/src/blas/pklevel3 ; $(MAKE) lib
 	cd $(BLDdir)/src/blas/reference/level3 ; $(MAKE) lib
-	cd $(BLDdir)/src/lapack ; $(MAKE) lib
+#	cd $(BLDdir)/src/lapack ; $(MAKE) lib
 	cd $(BLDdir)/interfaces/blas/C/src ; $(MAKE) all
 	- cd $(BLDdir)/interfaces/blas/F77/src ; $(MAKE) lib
-	cd $(BLDdir)/interfaces/lapack/C/src ; $(MAKE) lib
-	- cd $(BLDdir)/interfaces/lapack/F77/src ; $(MAKE) lib
+#	cd $(BLDdir)/interfaces/lapack/C/src ; $(MAKE) lib
+#	- cd $(BLDdir)/interfaces/lapack/F77/src ; $(MAKE) lib
 
 IPostTune:
 	cd $(L3Tdir) ; $(MAKE) res/atlas_trsmNB.h
@@ -783,7 +783,7 @@
 	cd $(L1Bdir) ; $(MAKE) slvl1
 
 slapack :
-	cd $(BLDdir)/src/lapack ; $(MAKE) slib
+#	cd $(BLDdir)/src/lapack ; $(MAKE) slib
 
 xsprintblk : sprintblk.o
 	$(CLINKER) -o $@ sprintblk.o $(ATLASlib)
@@ -1363,7 +1363,7 @@
 	cd $(L1Bdir) ; $(MAKE) dlvl1
 
 dlapack :
-	cd $(BLDdir)/src/lapack ; $(MAKE) dlib
+#	cd $(BLDdir)/src/lapack ; $(MAKE) dlib
 
 xdprintblk : dprintblk.o
 	$(CLINKER) -o $@ dprintblk.o $(ATLASlib)
diff -Nru ATLAS.orig/makes/Make.cblas ATLAS/makes/Make.cblas
--- ATLAS.orig/makes/Make.cblas	2006-08-22 17:17:16.000000000 +0200
+++ ATLAS/makes/Make.cblas	2006-08-28 21:59:42.000000000 +0200
@@ -1,6 +1,9 @@
 include Make.inc
 mySRCdir = $(SRCdir)/interfaces/blas/C/src/
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
+
 aobj = cblas_xerbla.o cblas_errprn.o
 sptlvl3obj = cblas_sptgemm.o cblas_sptsymm.o cblas_sptsyr2k.o cblas_sptsyrk.o \
              cblas_spttrmm.o cblas_spttrsm.o
diff -Nru ATLAS.orig/makes/Make.Clp ATLAS/makes/Make.Clp
--- ATLAS.orig/makes/Make.Clp	2006-08-22 17:17:16.000000000 +0200
+++ ATLAS/makes/Make.Clp	2006-08-28 22:05:04.000000000 +0200
@@ -1,6 +1,13 @@
 include Make.inc
 mySRCdir = $(SRCdir)/interfaces/lapack/C/src
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+
 sobj = clapack_sgesv.o clapack_sgetrf.o clapack_sgetri.o clapack_sgetrs.o \
        clapack_slauum.o clapack_sposv.o clapack_spotrf.o clapack_spotri.o \
        clapack_spotrs.o clapack_strtri.o
diff -Nru ATLAS.orig/makes/Make.f77blas ATLAS/makes/Make.f77blas
--- ATLAS.orig/makes/Make.f77blas	2006-08-22 17:17:16.000000000 +0200
+++ ATLAS/makes/Make.f77blas	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,10 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/interfaces/blas/F77/src
+
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+F77:=$(LIBTOOL) --tag=F77 $(F77)
+
 #
 ########################################################################
 #
diff -Nru ATLAS.orig/makes/Make.Flp ATLAS/makes/Make.Flp
--- ATLAS.orig/makes/Make.Flp	2006-08-22 17:17:16.000000000 +0200
+++ ATLAS/makes/Make.Flp	2006-08-28 22:07:02.000000000 +0200
@@ -1,6 +1,14 @@
 include Make.inc
 mySRCdir = $(SRCdir)/interfaces/lapack/F77/src
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+F77:=$(LIBTOOL) --tag=F77 $(F77)
+
 sobj = ATL_f77wrap_sgesv.o ATL_f77wrap_sgetnb.o ATL_f77wrap_sgetrf.o \
        ATL_f77wrap_sgetri.o ATL_f77wrap_sgetrs.o ATL_f77wrap_slauum.o \
        ATL_f77wrap_sposv.o ATL_f77wrap_spotrf.o ATL_f77wrap_spotrs.o \
diff -Nru ATLAS.orig/makes/Make.gpmm ATLAS/makes/Make.gpmm
--- ATLAS.orig/makes/Make.gpmm	2006-08-22 17:17:16.000000000 +0200
+++ ATLAS/makes/Make.gpmm	2006-08-28 21:59:42.000000000 +0200
@@ -1,6 +1,8 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/pklevel3/gpmm
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 all : lib
 lib : dlib slib zlib clib
 clean : sclean dclean cclean zclean
diff -Nru ATLAS.orig/makes/Make.l1ptblas ATLAS/makes/Make.l1ptblas
--- ATLAS.orig/makes/Make.l1ptblas	2006-08-22 17:17:16.000000000 +0200
+++ ATLAS/makes/Make.l1ptblas	2006-08-28 21:59:42.000000000 +0200
@@ -1,3 +1,10 @@
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+
 slib:
 dlib:
 clib:
diff -Nru ATLAS.orig/makes/Make.l1ref ATLAS/makes/Make.l1ref
--- ATLAS.orig/makes/Make.l1ref	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l1ref	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,10 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/reference/level1
+
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
+
 #
 ########################################################################
 #
diff -Nru ATLAS.orig/makes/Make.l1src ATLAS/makes/Make.l1src
--- ATLAS.orig/makes/Make.l1src	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l1src	2006-08-28 21:59:42.000000000 +0200
@@ -1,6 +1,10 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/level1
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+
 sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o
 
 dobj = ATL_drotg.o ATL_drotm.o ATL_drotmg.o
@@ -17,29 +21,29 @@
 
 sgen :
 	$(MAKE) Make_srot
-	$(MAKE) -f Make_srot lib
+	$(MAKE) -f Make_srot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_saxpby
-	$(MAKE) -f Make_saxpby lib
+	$(MAKE) -f Make_saxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_scpsc
-	$(MAKE) -f Make_scpsc lib
+	$(MAKE) -f Make_scpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_sset
-	$(MAKE) -f Make_sset lib
+	$(MAKE) -f Make_sset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_snrm2
-	$(MAKE) -f Make_snrm2 lib
+	$(MAKE) -f Make_snrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_sasum
-	$(MAKE) -f Make_sasum lib
+	$(MAKE) -f Make_sasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_sdot
-	$(MAKE) -f Make_sdot lib
+	$(MAKE) -f Make_sdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_sswap
-	$(MAKE) -f Make_sswap lib
+	$(MAKE) -f Make_sswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_sscal
-	$(MAKE) -f Make_sscal lib
+	$(MAKE) -f Make_sscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_scopy
-	$(MAKE) -f Make_scopy lib
+	$(MAKE) -f Make_scopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_saxpy
-	$(MAKE) -f Make_saxpy lib
+	$(MAKE) -f Make_saxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_siamax
-	$(MAKE) -f Make_siamax lib
+	$(MAKE) -f Make_siamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 slvl1 : slib
 slib :   slib.grd
 	$(MAKE) sgen
@@ -52,29 +56,29 @@
 	rm -f $(sobj) s*.grd
 dgen :
 	$(MAKE) Make_drot
-	$(MAKE) -f Make_drot lib
+	$(MAKE) -f Make_drot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_daxpby
-	$(MAKE) -f Make_daxpby lib
+	$(MAKE) -f Make_daxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_dcpsc
-	$(MAKE) -f Make_dcpsc lib
+	$(MAKE) -f Make_dcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_dset
-	$(MAKE) -f Make_dset lib
+	$(MAKE) -f Make_dset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_dnrm2
-	$(MAKE) -f Make_dnrm2 lib
+	$(MAKE) -f Make_dnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_dasum
-	$(MAKE) -f Make_dasum lib
+	$(MAKE) -f Make_dasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_ddot
-	$(MAKE) -f Make_ddot lib
+	$(MAKE) -f Make_ddot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_dswap
-	$(MAKE) -f Make_dswap lib
+	$(MAKE) -f Make_dswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_dscal
-	$(MAKE) -f Make_dscal lib
+	$(MAKE) -f Make_dscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_dcopy
-	$(MAKE) -f Make_dcopy lib
+	$(MAKE) -f Make_dcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_daxpy
-	$(MAKE) -f Make_daxpy lib
+	$(MAKE) -f Make_daxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_diamax
-	$(MAKE) -f Make_diamax lib
+	$(MAKE) -f Make_diamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 dlvl1 : dlib
 dlib :   dlib.grd
 	$(MAKE) dgen
@@ -87,31 +91,31 @@
 	rm -f $(dobj) d*.grd
 cgen :
 	$(MAKE) Make_crot
-	$(MAKE) -f Make_crot lib
+	$(MAKE) -f Make_crot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_caxpby
-	$(MAKE) -f Make_caxpby lib
+	$(MAKE) -f Make_caxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_ccpsc
-	$(MAKE) -f Make_ccpsc lib
+	$(MAKE) -f Make_ccpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_cset
-	$(MAKE) -f Make_cset lib
+	$(MAKE) -f Make_cset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_cnrm2
-	$(MAKE) -f Make_cnrm2 lib
+	$(MAKE) -f Make_cnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_casum
-	$(MAKE) -f Make_casum lib
+	$(MAKE) -f Make_casum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_cdot
-	$(MAKE) -f Make_cdot lib
+	$(MAKE) -f Make_cdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_cswap
-	$(MAKE) -f Make_cswap lib
+	$(MAKE) -f Make_cswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_cscal
-	$(MAKE) -f Make_cscal lib
+	$(MAKE) -f Make_cscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_ccopy
-	$(MAKE) -f Make_ccopy lib
+	$(MAKE) -f Make_ccopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_caxpy
-	$(MAKE) -f Make_caxpy lib
+	$(MAKE) -f Make_caxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_ciamax
-	$(MAKE) -f Make_ciamax lib
+	$(MAKE) -f Make_ciamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_cdotc
-	$(MAKE) -f Make_cdotc lib
+	$(MAKE) -f Make_cdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 clvl1 : clib
 clib : slib clib.grd
 	$(MAKE) cgen
@@ -124,31 +128,31 @@
 	rm -f $(cobj) c*.grd
 zgen :
 	$(MAKE) Make_zrot
-	$(MAKE) -f Make_zrot lib
+	$(MAKE) -f Make_zrot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zaxpby
-	$(MAKE) -f Make_zaxpby lib
+	$(MAKE) -f Make_zaxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zcpsc
-	$(MAKE) -f Make_zcpsc lib
+	$(MAKE) -f Make_zcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zset
-	$(MAKE) -f Make_zset lib
+	$(MAKE) -f Make_zset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_znrm2
-	$(MAKE) -f Make_znrm2 lib
+	$(MAKE) -f Make_znrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zasum
-	$(MAKE) -f Make_zasum lib
+	$(MAKE) -f Make_zasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zdot
-	$(MAKE) -f Make_zdot lib
+	$(MAKE) -f Make_zdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zswap
-	$(MAKE) -f Make_zswap lib
+	$(MAKE) -f Make_zswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zscal
-	$(MAKE) -f Make_zscal lib
+	$(MAKE) -f Make_zscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zcopy
-	$(MAKE) -f Make_zcopy lib
+	$(MAKE) -f Make_zcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zaxpy
-	$(MAKE) -f Make_zaxpy lib
+	$(MAKE) -f Make_zaxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_ziamax
-	$(MAKE) -f Make_ziamax lib
+	$(MAKE) -f Make_ziamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(MAKE) Make_zdotc
-	$(MAKE) -f Make_zdotc lib
+	$(MAKE) -f Make_zdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 zlvl1 : zlib
 zlib : dlib zlib.grd
 	$(MAKE) zgen
diff -Nru ATLAS.orig/makes/Make.l1tune ATLAS/makes/Make.l1tune
--- ATLAS.orig/makes/Make.l1tune	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l1tune	2006-08-28 21:59:42.000000000 +0200
@@ -1221,7 +1221,7 @@
 	./xaxpysrch -p c
 	cp -f GEN/* $(L1Bdir)/.
 ATL_caxpy_stub.o : $(mySRCdir)/AXPY/axpy_stub.c
-	$(ICC) $(ICCFLAGS) -DSCPLX -c -o $@ $(mySRCdir)/AXPY/axpy_stub.c
+	$(LIBTOOL) --tag=CC $(ICC) $(ICCFLAGS) -DSCPLX -c -o $@ $(mySRCdir)/AXPY/axpy_stub.c
 caxpytime.o : $(mySRCdir)/axpytime.c
 	$(ICC) $(ICCFLAGS) -o caxpytime.o -c -DSCPLX $(mySRCdir)/axpytime.c
 caxpytest.o : $(mySRCdir)/axpytest.c tstlib.grd
diff -Nru ATLAS.orig/makes/Make.l2 ATLAS/makes/Make.l2
--- ATLAS.orig/makes/Make.l2	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l2	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,8 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/level2/
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 #
 ########################################################################
 #
diff -Nru ATLAS.orig/makes/Make.l2aux ATLAS/makes/Make.l2aux
--- ATLAS.orig/makes/Make.l2aux	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l2aux	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,8 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/level2/kernel
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 #
 ########################################################################
 #
diff -Nru ATLAS.orig/makes/Make.l2ptblas ATLAS/makes/Make.l2ptblas
--- ATLAS.orig/makes/Make.l2ptblas	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l2ptblas	2006-08-28 21:59:42.000000000 +0200
@@ -1,3 +1,10 @@
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+
 slib:
 dlib:
 clib:
diff -Nru ATLAS.orig/makes/Make.l2ref ATLAS/makes/Make.l2ref
--- ATLAS.orig/makes/Make.l2ref	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l2ref	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,8 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/reference/level2
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 #
 ########################################################################
 # 
diff -Nru ATLAS.orig/makes/Make.l2src ATLAS/makes/Make.l2src
--- ATLAS.orig/makes/Make.l2src	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l2src	2006-08-28 21:59:42.000000000 +0200
@@ -1,5 +1,7 @@
 include Make.inc
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \
        ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \
        ATL_strmv.o ATL_strmvLN.o ATL_strmvLT.o ATL_strmvUN.o ATL_strmvUT.o
diff -Nru ATLAS.orig/makes/Make.l3 ATLAS/makes/Make.l3
--- ATLAS.orig/makes/Make.l3	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l3	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,8 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/level3
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 #
 ########################################################################
 #
diff -Nru ATLAS.orig/makes/Make.l3aux ATLAS/makes/Make.l3aux
--- ATLAS.orig/makes/Make.l3aux	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l3aux	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,8 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/level3/rblas
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 #
 ########################################################################
 #
diff -Nru ATLAS.orig/makes/Make.l3kern ATLAS/makes/Make.l3kern
--- ATLAS.orig/makes/Make.l3kern	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l3kern	2006-08-28 21:59:42.000000000 +0200
@@ -1,5 +1,6 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/level3/kernel
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
 
 sobj = ATL_ssycopyL_a1.o ATL_ssycopyL_aX.o ATL_ssycopyU_a1.o \
        ATL_ssycopyU_aX.o ATL_ssymmLL.o ATL_ssymmLU.o ATL_ssymmRL.o \
diff -Nru ATLAS.orig/makes/Make.l3ptblas ATLAS/makes/Make.l3ptblas
--- ATLAS.orig/makes/Make.l3ptblas	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l3ptblas	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,8 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/src/pthreads/blas/level3
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 #
 ########################################################################
 #
diff -Nru ATLAS.orig/makes/Make.l3ref ATLAS/makes/Make.l3ref
--- ATLAS.orig/makes/Make.l3ref	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l3ref	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,8 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/reference/level3
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 #
 ########################################################################
 #
diff -Nru ATLAS.orig/makes/Make.l3tune ATLAS/makes/Make.l3tune
--- ATLAS.orig/makes/Make.l3tune	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.l3tune	2006-08-28 21:59:42.000000000 +0200
@@ -33,16 +33,16 @@
 
 force_build :
 
-res/atlas_trsmNB.h : xgen_trsmnb res/sTRSM_NB res/dTRSM_NB
-	./xgen_trsmnb
-	rm -f $(INCAdir)/atlas_trsmNB.h
-	cp res/atlas_trsmNB.h $(INCAdir)/.
+res/atlas_trsmNB.h : 
+#	./xgen_trsmnb
+#	rm -f $(INCAdir)/atlas_trsmNB.h
+#	cp res/atlas_trsmNB.h $(INCAdir)/.
 xgen_trsmnb : $(mySRCdir)/gen_trsmnb.c
 	$(XCC) $(XCCFLAGS) -o $@ $(mySRCdir)/gen_trsmnb.c
 
 res/sTRSM_NB :
-	$(MAKE) xsinvtrsm
-	$(ATLRUN) $(L3Tdir) xsinvtrsm
+#	$(MAKE) xsinvtrsm
+#	$(ATLRUN) $(L3Tdir) xsinvtrsm
 xsinvtrsm : sinvtrsm.o ATL_strsm.o 
 	$(MAKE) sbindep
 	$(FLINKER) $(FCLINKFLAGS) -o $@ sinvtrsm.o ATL_strsm.o \
@@ -57,8 +57,8 @@
 	$(ICC) -o $@ -c $(ICCFLAGS) -DSREAL $(mySRCdir)/ATL_trsm.c
 
 res/dTRSM_NB :
-	$(MAKE) xdinvtrsm
-	$(ATLRUN) $(L3Tdir) xdinvtrsm
+#	$(MAKE) xdinvtrsm
+#	$(ATLRUN) $(L3Tdir) xdinvtrsm
 xdinvtrsm : dinvtrsm.o ATL_dtrsm.o 
 	$(MAKE) dbindep
 	$(FLINKER) $(FCLINKFLAGS) -o $@ dinvtrsm.o ATL_dtrsm.o \
@@ -73,8 +73,8 @@
 	$(ICC) -o $@ -c $(ICCFLAGS) -DDREAL $(mySRCdir)/ATL_trsm.c
 
 res/cTRSM_NB :
-	$(MAKE) xcinvtrsm
-	$(ATLRUN) $(L3Tdir) xcinvtrsm
+#	$(MAKE) xcinvtrsm
+#	$(ATLRUN) $(L3Tdir) xcinvtrsm
 xcinvtrsm : cinvtrsm.o ATL_ctrsm.o 
 	$(MAKE) cbindep
 	$(FLINKER) $(FCLINKFLAGS) -o $@ cinvtrsm.o ATL_ctrsm.o \
@@ -89,8 +89,8 @@
 	$(ICC) -o $@ -c $(ICCFLAGS) -DSCPLX $(mySRCdir)/ATL_trsm.c
 
 res/zTRSM_NB :
-	$(MAKE) xzinvtrsm
-	$(ATLRUN) $(L3Tdir) xzinvtrsm
+#	$(MAKE) xzinvtrsm
+#	$(ATLRUN) $(L3Tdir) xzinvtrsm
 xzinvtrsm : zinvtrsm.o ATL_ztrsm.o 
 	$(MAKE) zbindep
 	$(FLINKER) $(FCLINKFLAGS) -o $@ zinvtrsm.o ATL_ztrsm.o \
diff -Nru ATLAS.orig/makes/Make.lpsrc ATLAS/makes/Make.lpsrc
--- ATLAS.orig/makes/Make.lpsrc	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.lpsrc	2006-08-28 22:03:43.000000000 +0200
@@ -1,6 +1,13 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/lapack
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+
 all : lib
 lib : dlib slib zlib clib
 clean : sclean dclean cclean zclean
diff -Nru ATLAS.orig/makes/Make.miptblas ATLAS/makes/Make.miptblas
--- ATLAS.orig/makes/Make.miptblas	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.miptblas	2006-08-28 21:59:42.000000000 +0200
@@ -44,6 +44,8 @@
 #
 include Make.inc
 mySRCdir = $(SRCdir)/src/pthreads/misc
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+
 #
 ########################################################################
 #
diff -Nru ATLAS.orig/makes/Make.mmsrc ATLAS/makes/Make.mmsrc
--- ATLAS.orig/makes/Make.mmsrc	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.mmsrc	2006-08-28 21:59:42.000000000 +0200
@@ -1,5 +1,6 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/gemm
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
 
 $(INCAdir)/atlas_type.h :
 	cd $(SYSdir) ; $(MAKE) RunTyp
@@ -82,7 +83,7 @@
 sclean :
 	rm -f $(sobj) s*.grd
 scleanuplib :
-	cd KERNEL ; $(MAKE) -f sMakefile slib
+	cd KERNEL ; $(MAKE) -f sMakefile slib ICC="$(ICC)"
 
 slib : 
 	$(MAKE) auxillib scleanuplib susergemm
@@ -205,7 +206,7 @@
 dclean :
 	rm -f $(dobj) d*.grd
 dcleanuplib :
-	cd KERNEL ; $(MAKE) -f dMakefile dlib
+	cd KERNEL ; $(MAKE) -f dMakefile dlib ICC="$(ICC)"
 
 dlib : 
 	$(MAKE) auxillib dcleanuplib dusergemm
@@ -328,7 +329,7 @@
 cclean :
 	rm -f $(cobj) c*.grd
 ccleanuplib :
-	cd KERNEL ; $(MAKE) -f cMakefile clib
+	cd KERNEL ; $(MAKE) -f cMakefile clib ICC="$(ICC)"
 
 clib : 
 	$(MAKE) auxillib ccleanuplib cusergemm
@@ -515,7 +516,7 @@
 zclean :
 	rm -f $(zobj) z*.grd
 zcleanuplib :
-	cd KERNEL ; $(MAKE) -f zMakefile zlib
+	cd KERNEL ; $(MAKE) -f zMakefile zlib ICC="$(ICC)"
 
 zlib : 
 	$(MAKE) auxillib zcleanuplib zusergemm
diff -Nru ATLAS.orig/makes/Make.mvsrc ATLAS/makes/Make.mvsrc
--- ATLAS.orig/makes/Make.mvsrc	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.mvsrc	2006-08-28 21:59:42.000000000 +0200
@@ -1,6 +1,14 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/gemv
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+
+
 sobj = ATL_sgemv.o
 
 dobj = ATL_dgemv.o
@@ -19,7 +27,7 @@
 clean : sclean dclean cclean zclean
 
 dlib : 
-	$(PMAKE) -f Make_dmv dlib
+	$(PMAKE) -f Make_dmv dlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(PMAKE) dlib.grd
 dlib.grd : $(dobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
@@ -28,7 +36,7 @@
 dclean : 
 	rm -f $(dobj) d*.grd
 slib : 
-	$(PMAKE) -f Make_smv slib
+	$(PMAKE) -f Make_smv slib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(PMAKE) slib.grd
 slib.grd : $(sobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
@@ -37,7 +45,7 @@
 sclean : 
 	rm -f $(sobj) s*.grd
 clib : 
-	$(PMAKE) -f Make_cmv clib
+	$(PMAKE) -f Make_cmv clib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(PMAKE) clib.grd
 clib.grd : $(cobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
@@ -46,7 +54,7 @@
 cclean : 
 	rm -f $(cobj) c*.grd
 zlib : 
-	$(PMAKE) -f Make_zmv zlib
+	$(PMAKE) -f Make_zmv zlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 	$(PMAKE) zlib.grd
 zlib.grd : $(zobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
diff -Nru ATLAS.orig/makes/Make.mvtune ATLAS/makes/Make.mvtune
--- ATLAS.orig/makes/Make.mvtune	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.mvtune	2006-08-28 21:59:42.000000000 +0200
@@ -180,24 +180,24 @@
 ATL_ssymv.o : $(mySRCdir)/ATL_symv.c atlas_smvN.h atlas_smvS.h
 	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSREAL $(mySRCdir)/ATL_symv.c
 ATL_sgemv.o : ATL_gemv.c atlas_smv.h atlas_smvN.h atlas_smvT.h
-	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSREAL ATL_gemv.c
+	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSREAL ATL_gemv.c
 ATL_sgemvN_b0.o : ATL_sgemvN.c
-	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSREAL -DBETA0 -DALPHA1 ATL_sgemvN.c
 ATL_sgemvN_b1.o : ATL_sgemvN.c
-	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSREAL -DBETA1 -DALPHA1 ATL_sgemvN.c
 ATL_sgemvN_bX.o : ATL_sgemvN.c
-	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSREAL -DBETAX -DALPHA1 ATL_sgemvN.c
 ATL_sgemvT_b0.o : ATL_sgemvT.c
-	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSREAL -DBETA0 -DALPHA1 ATL_sgemvT.c
 ATL_sgemvT_b1.o : ATL_sgemvT.c
-	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSREAL -DBETA1 -DALPHA1 ATL_sgemvT.c
 ATL_sgemvT_bX.o : ATL_sgemvT.c
-	$(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(sMVCC) -c -I$(MVTdir) $(sMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSREAL -DBETAX -DALPHA1 ATL_sgemvT.c
 
 res/sMVRES : xmvsearch force_build
@@ -325,24 +325,24 @@
 ATL_dsymv.o : $(mySRCdir)/ATL_symv.c atlas_dmvN.h atlas_dmvS.h
 	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDREAL $(mySRCdir)/ATL_symv.c
 ATL_dgemv.o : ATL_gemv.c atlas_dmv.h atlas_dmvN.h atlas_dmvT.h
-	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDREAL ATL_gemv.c
+	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDREAL ATL_gemv.c
 ATL_dgemvN_b0.o : ATL_dgemvN.c
-	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDREAL -DBETA0 -DALPHA1 ATL_dgemvN.c
 ATL_dgemvN_b1.o : ATL_dgemvN.c
-	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDREAL -DBETA1 -DALPHA1 ATL_dgemvN.c
 ATL_dgemvN_bX.o : ATL_dgemvN.c
-	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDREAL -DBETAX -DALPHA1 ATL_dgemvN.c
 ATL_dgemvT_b0.o : ATL_dgemvT.c
-	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDREAL -DBETA0 -DALPHA1 ATL_dgemvT.c
 ATL_dgemvT_b1.o : ATL_dgemvT.c
-	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDREAL -DBETA1 -DALPHA1 ATL_dgemvT.c
 ATL_dgemvT_bX.o : ATL_dgemvT.c
-	$(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(dMVCC) -c -I$(MVTdir) $(dMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDREAL -DBETAX -DALPHA1 ATL_dgemvT.c
 
 res/dMVRES : xmvsearch force_build
@@ -464,56 +464,56 @@
 cgemvtune.o : $(mySRCdir)/gemvtune.c
 	$(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/gemvtune.c
 ATL_csymv.o : $(mySRCdir)/ATL_symv.c atlas_cmvN.h atlas_cmvS.h
-	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/ATL_symv.c
+	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/ATL_symv.c
 ATL_cgemv.o : ATL_gemv.c atlas_cmv.h atlas_cmvN.h atlas_cmvT.h
-	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSCPLX ATL_gemv.c
+	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DSCPLX ATL_gemv.c
 ATL_cgemvN_b0.o : ATL_cgemvN.c
-	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSCPLX -DBETA0 -DALPHA1 ATL_cgemvN.c
 ATL_cgemvN_b1.o : ATL_cgemvN.c
-	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSCPLX -DBETA1 -DALPHA1 ATL_cgemvN.c
 ATL_cgemvN_bX.o : ATL_cgemvN.c
-	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSCPLX -DBETAX -DALPHA1 ATL_cgemvN.c
 ATL_cgemvN_bXi0.o : ATL_cgemvN.c
-	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSCPLX -DBETAXI0 -DALPHA1 ATL_cgemvN.c
 ATL_cgemvT_b0.o : ATL_cgemvT.c
-	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSCPLX -DBETA0 -DALPHA1 ATL_cgemvT.c
 ATL_cgemvT_b1.o : ATL_cgemvT.c
-	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSCPLX -DBETA1 -DALPHA1 ATL_cgemvT.c
 ATL_cgemvT_bX.o : ATL_cgemvT.c
-	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSCPLX -DBETAX -DALPHA1 ATL_cgemvT.c
 ATL_cgemvT_bXi0.o : ATL_cgemvT.c
-	$(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c -I$(MVTdir) $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DSCPLX -DBETAXI0 -DALPHA1 ATL_cgemvT.c
 ATL_cgemvC_b0.o : ATL_cgemvT.c
-	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DSCPLX -DBETA0 -DALPHA1 -DConj_ ATL_cgemvT.c
 ATL_cgemvC_b1.o : ATL_cgemvT.c
-	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DSCPLX -DBETA1 -DALPHA1 -DConj_ ATL_cgemvT.c
 ATL_cgemvC_bX.o : ATL_cgemvT.c
-	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DSCPLX -DBETAX -DALPHA1 -DConj_ ATL_cgemvT.c
 ATL_cgemvC_bXi0.o : ATL_cgemvT.c
-	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DSCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_cgemvT.c
 ATL_cgemvNc_b0.o : ATL_cgemvN.c
-	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DSCPLX -DBETA0 -DALPHA1 -DConj_ ATL_cgemvN.c
 ATL_cgemvNc_b1.o : ATL_cgemvN.c
-	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DSCPLX -DBETA1 -DALPHA1 -DConj_ ATL_cgemvN.c
 ATL_cgemvNc_bX.o : ATL_cgemvN.c
-	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DSCPLX -DBETAX -DALPHA1 -DConj_ ATL_cgemvN.c
 ATL_cgemvNc_bXi0.o : ATL_cgemvN.c
-	$(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(cMVCC) -c $(cMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DSCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_cgemvN.c
 
 res/cMVRES : xmvsearch force_build
@@ -635,56 +635,56 @@
 zgemvtune.o : $(mySRCdir)/gemvtune.c
 	$(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/gemvtune.c
 ATL_zsymv.o : $(mySRCdir)/ATL_symv.c atlas_zmvN.h atlas_zmvS.h
-	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/ATL_symv.c
+	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/ATL_symv.c
 ATL_zgemv.o : ATL_gemv.c atlas_zmv.h atlas_zmvN.h atlas_zmvT.h
-	$(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDCPLX ATL_gemv.c
+	$(LIBTOOL) --tag=CC $(ICC) -c -I$(MVTdir) $(ICCFLAGS) -o $@ -DDCPLX ATL_gemv.c
 ATL_zgemvN_b0.o : ATL_zgemvN.c
-	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDCPLX -DBETA0 -DALPHA1 ATL_zgemvN.c
 ATL_zgemvN_b1.o : ATL_zgemvN.c
-	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDCPLX -DBETA1 -DALPHA1 ATL_zgemvN.c
 ATL_zgemvN_bX.o : ATL_zgemvN.c
-	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDCPLX -DBETAX -DALPHA1 ATL_zgemvN.c
 ATL_zgemvN_bXi0.o : ATL_zgemvN.c
-	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDCPLX -DBETAXI0 -DALPHA1 ATL_zgemvN.c
 ATL_zgemvT_b0.o : ATL_zgemvT.c
-	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDCPLX -DBETA0 -DALPHA1 ATL_zgemvT.c
 ATL_zgemvT_b1.o : ATL_zgemvT.c
-	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDCPLX -DBETA1 -DALPHA1 ATL_zgemvT.c
 ATL_zgemvT_bX.o : ATL_zgemvT.c
-	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDCPLX -DBETAX -DALPHA1 ATL_zgemvT.c
 ATL_zgemvT_bXi0.o : ATL_zgemvT.c
-	$(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c -I$(MVTdir) $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -o $@ \
               -DDCPLX -DBETAXI0 -DALPHA1 ATL_zgemvT.c
 ATL_zgemvC_b0.o : ATL_zgemvT.c
-	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DDCPLX -DBETA0 -DALPHA1 -DConj_ ATL_zgemvT.c
 ATL_zgemvC_b1.o : ATL_zgemvT.c
-	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DDCPLX -DBETA1 -DALPHA1 -DConj_ ATL_zgemvT.c
 ATL_zgemvC_bX.o : ATL_zgemvT.c
-	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DDCPLX -DBETAX -DALPHA1 -DConj_ ATL_zgemvT.c
 ATL_zgemvC_bXi0.o : ATL_zgemvT.c
-	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DDCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_zgemvT.c
 ATL_zgemvNc_b0.o : ATL_zgemvN.c
-	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DDCPLX -DBETA0 -DALPHA1 -DConj_ ATL_zgemvN.c
 ATL_zgemvNc_b1.o : ATL_zgemvN.c
-	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DDCPLX -DBETA1 -DALPHA1 -DConj_ ATL_zgemvN.c
 ATL_zgemvNc_bX.o : ATL_zgemvN.c
-	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DDCPLX -DBETAX -DALPHA1 -DConj_ ATL_zgemvN.c
 ATL_zgemvNc_bXi0.o : ATL_zgemvN.c
-	$(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
+	$(LIBTOOL) --tag=CC $(zMVCC) -c $(zMVFLAGS) $(CDEFS) $(EXTFLAGS) -I$(MVTdir) -o $@ \
               -DDCPLX -DBETAXI0 -DALPHA1 -DConj_ ATL_zgemvN.c
 
 res/zMVRES : xmvsearch force_build
diff -Nru ATLAS.orig/makes/Make.pkl3 ATLAS/makes/Make.pkl3
--- ATLAS.orig/makes/Make.pkl3	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.pkl3	2006-08-28 21:59:42.000000000 +0200
@@ -1,6 +1,14 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/pklevel3
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+
+
 all : lib
 lib : dlib slib zlib clib
 clean : sclean dclean cclean zclean
diff -Nru ATLAS.orig/makes/Make.r1src ATLAS/makes/Make.r1src
--- ATLAS.orig/makes/Make.r1src	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.r1src	2006-08-28 21:59:42.000000000 +0200
@@ -1,6 +1,14 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/ger
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+
+
 sobj = ATL_sger.o
 dobj = ATL_dger.o
 cobj = ATL_cgeru.o ATL_cgerc.o
@@ -17,7 +25,7 @@
 
 dlib :
 	$(PMAKE) dlib.grd
-	$(PMAKE) -f Make_dr1 lib
+	$(PMAKE) -f Make_dr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 dlib.grd : $(dobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
 	$(RANLIB) $(ATLASlib)
@@ -26,7 +34,7 @@
 	rm -f $(dobj) d*.grd
 slib :
 	$(PMAKE) slib.grd
-	$(PMAKE) -f Make_sr1 lib
+	$(PMAKE) -f Make_sr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 slib.grd : $(sobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
 	$(RANLIB) $(ATLASlib)
@@ -35,7 +43,7 @@
 	rm -f $(sobj) s*.grd
 clib :
 	$(PMAKE) clib.grd
-	$(PMAKE) -f Make_cr1 lib
+	$(PMAKE) -f Make_cr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 clib.grd : $(cobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
 	$(RANLIB) $(ATLASlib)
@@ -44,7 +52,7 @@
 	rm -f $(cobj) c*.grd
 zlib :
 	$(PMAKE) zlib.grd
-	$(PMAKE) -f Make_zr1 lib
+	$(PMAKE) -f Make_zr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)"
 zlib.grd : $(zobj)
 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
 	$(RANLIB) $(ATLASlib)
diff -Nru ATLAS.orig/makes/Make.r1tune ATLAS/makes/Make.r1tune
--- ATLAS.orig/makes/Make.r1tune	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.r1tune	2006-08-28 21:59:42.000000000 +0200
@@ -74,12 +74,12 @@
 ATL_sger.o : ATL_ger.c atlas_sr1.h
 	$(ICC) -c $(ICCFLAGS) -o $@ -DSREAL -I$(R1Tdir) ATL_ger.c
 ATL_sger1.o : ATL_sger1.c
-	$(sR1CC) -c $(CDEFS) $(sR1CFLAGS) -I$(R1Tdir) -o $@ -DSREAL ATL_sger1.c
+	$(LIBTOOL) --tag=CC $(sR1CC) -c $(CDEFS) $(sR1CFLAGS) -I$(R1Tdir) -o $@ -DSREAL ATL_sger1.c
 ATL_sger1c.o : ATL_sger1.c
-	$(sR1CC) -c $(CDEFS) $(sR1CFLAGS) -I$(R1Tdir) -o $@ -DSREAL -DConj_ \
+	$(LIBTOOL) --tag=CC $(sR1CC) -c $(CDEFS) $(sR1CFLAGS) -I$(R1Tdir) -o $@ -DSREAL -DConj_ \
               ATL_sger1.c
 ATL_sger1_dummy.o : ATL_sger1_dummy.c
-	$(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DSREAL ATL_sger1_dummy.c
+	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DSREAL ATL_sger1_dummy.c
 
 res/sR1RES : xr1search force_build
 	./xr1search -p s
@@ -177,14 +177,14 @@
 cger1tune.o : $(mySRCdir)/ger1tune.c
 	$(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX $(mySRCdir)/ger1tune.c
 ATL_cger.o : ATL_ger.c atlas_cr1.h
-	$(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX -I$(R1Tdir) ATL_ger.c
+	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -o $@ -DSCPLX -I$(R1Tdir) ATL_ger.c
 ATL_cger1.o : ATL_cger1.c
-	$(cR1CC) -c $(CDEFS) $(cR1CFLAGS) -I$(R1Tdir) -o $@ -DSCPLX ATL_cger1.c
+	$(LIBTOOL) --tag=CC $(cR1CC) -c $(CDEFS) $(cR1CFLAGS) -I$(R1Tdir) -o $@ -DSCPLX ATL_cger1.c
 ATL_cger1c.o : ATL_cger1.c
-	$(cR1CC) -c $(CDEFS) $(cR1CFLAGS) -I$(R1Tdir) -o $@ -DSCPLX -DConj_ \
+	$(LIBTOOL) --tag=CC $(cR1CC) -c $(CDEFS) $(cR1CFLAGS) -I$(R1Tdir) -o $@ -DSCPLX -DConj_ \
               ATL_cger1.c
 ATL_cger1_dummy.o : ATL_cger1_dummy.c
-	$(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DSCPLX ATL_cger1_dummy.c
+	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DSCPLX ATL_cger1_dummy.c
 
 res/cR1RES : xr1search force_build
 	./xr1search -p c
@@ -230,14 +230,14 @@
 zger1tune.o : $(mySRCdir)/ger1tune.c
 	$(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX $(mySRCdir)/ger1tune.c
 ATL_zger.o : ATL_ger.c atlas_zr1.h
-	$(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX -I$(R1Tdir) ATL_ger.c
+	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -o $@ -DDCPLX -I$(R1Tdir) ATL_ger.c
 ATL_zger1.o : ATL_zger1.c
-	$(zR1CC) -c $(CDEFS) $(zR1CFLAGS) -I$(R1Tdir) -o $@ -DDCPLX ATL_zger1.c
+	$(LIBTOOL) --tag=CC $(zR1CC) -c $(CDEFS) $(zR1CFLAGS) -I$(R1Tdir) -o $@ -DDCPLX ATL_zger1.c
 ATL_zger1c.o : ATL_zger1.c
-	$(zR1CC) -c $(CDEFS) $(zR1CFLAGS) -I$(R1Tdir) -o $@ -DDCPLX -DConj_ \
+	$(LIBTOOL) --tag=CC $(zR1CC) -c $(CDEFS) $(zR1CFLAGS) -I$(R1Tdir) -o $@ -DDCPLX -DConj_ \
               ATL_zger1.c
 ATL_zger1_dummy.o : ATL_zger1_dummy.c
-	$(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DDCPLX ATL_zger1_dummy.c
+	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) -I$(R1Tdir) -o $@ -DDCPLX ATL_zger1_dummy.c
 
 res/zR1RES : xr1search force_build
 	./xr1search -p z
diff -Nru ATLAS.orig/makes/Make.sprk ATLAS/makes/Make.sprk
--- ATLAS.orig/makes/Make.sprk	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.sprk	2006-08-28 21:59:42.000000000 +0200
@@ -1,6 +1,14 @@
 include Make.inc
 mySRCdir = $(SRCdir)/src/blas/pklevel3/sprk
 
+ICC:=$(LIBTOOL) --tag=CC $(ICC)
+SMC:=$(LIBTOOL) --tag=CC $(SMC)
+DMC:=$(LIBTOOL) --tag=CC $(DMC)
+SKC:=$(LIBTOOL) --tag=CC $(SKC)
+DKC:=$(LIBTOOL) --tag=CC $(DKC)
+XCC:=$(LIBTOOL) --tag=CC $(XCC)
+
+
 all : lib
 lib : dlib slib zlib clib
 clean : sclean dclean cclean zclean
diff -Nru ATLAS.orig/makes/Make.sysinfo ATLAS/makes/Make.sysinfo
--- ATLAS.orig/makes/Make.sysinfo	2006-08-22 17:17:17.000000000 +0200
+++ ATLAS/makes/Make.sysinfo	2006-08-28 21:59:42.000000000 +0200
@@ -103,12 +103,12 @@
 ATL_cputime.c : 
 	cp $(mySRCdir)/ATL_cputime.c .
 ATL_cputime.o : ATL_cputime.c
-	$(ICC) -c $(ICCFLAGS) ATL_cputime.c
+	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_cputime.c
 
 ATL_walltime.c : 
 	cp $(mySRCdir)/ATL_walltime.c .
 ATL_walltime.o : ATL_walltime.c
-	$(ICC) -c $(ICCFLAGS) ATL_walltime.c
+	$(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_walltime.c
 
 ATL_Xwalltime.o : ATL_walltime.o
 	$(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c
diff -Nru ATLAS.orig/Make.top ATLAS/Make.top
--- ATLAS.orig/Make.top	2006-08-22 17:17:13.000000000 +0200
+++ ATLAS/Make.top	2006-08-28 21:59:42.000000000 +0200
@@ -24,6 +24,69 @@
 	- fgrep -e fault -e FAULT -e error -e ERROR -e fail -e FAIL \
 	        bin/sanity.out
 	@ echo "DONE"
+
+
+shared: INSTALLER = cp
+shared: libatlas.so libblas.so libcblas.so
+
+shared-strip: INSTALLER = install -s
+shared-strip: libatlas.so libblas.so libcblas.so
+
+ptshared: INSTALLER = cp
+ptshared: libptblas.so libptcblas.so
+
+ptshared-strip: INSTALLER = install -s
+ptshared-strip: libptblas.so libptcblas.so
+
+liblapack.so: RPATH = /usr/lib/lapack/atlas
+
+libatlas.so:
+	      mkdir -p gentoo/libs
+	      @echo
+	      @echo Linking a really big library, please be patient...
+	      @echo
+	      cd gentoo/libatlas.a ; \
+	      libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libatlas.la *.lo -rpath /usr/lib ; \
+	      libtool --mode=install $(INSTALLER) libatlas.la $(BLDdir)/gentoo/libs
+
+
+libblas.so:
+	cd gentoo/libf77blas.a ; \
+       libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libblas.la ../libs/libatlas.la *.lo -rpath $(RPATH); \
+       rm -f .libs/libblas.so.0.0.0; \
+       $(CC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
+       libtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/libs
+
+libcblas.so:
+	cd gentoo/libcblas.a ; \
+       libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libcblas.la ../libs/libatlas.la *.lo -rpath $(RPATH) ; \
+       rm -f .libs/libcblas.so.0.0.0; \
+       $(CC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
+       libtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/libs
+
+libptblas.so:
+	      mkdir -p gentoo/threaded-libs
+	      cd gentoo/libptf77blas.a ; \
+	      libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libblas.la ../libs/libatlas.la *.lo -rpath $(RPATH); \
+       rm -f .libs/libblas.so.0.0.0; \
+	      $(CC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
+	      libtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/threaded-libs
+
+libptcblas.so:
+       cd gentoo/libptcblas.a ; \
+       libtool --mode=link --tag=CC $(CC) SHRD_LNK -o libcblas.la ../libs/libatlas.la *.lo -rpath $(RPATH); \
+       rm -f .libs/libcblas.so.0.0.0; \
+       $(CC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so  -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
+       libtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/threaded-libs
+
+liblapack.so:
+		mkdir -p gentoo/libs
+		cd gentoo/liblapack.a ; \
+       libtool --mode=link --tag=CC $(CC) -o liblapack.la *.lo \
+               -rpath $(RPATH) -lblas -lcblas -latlas SHRD_LNK; \
+       libtool --mode=install $(INSTALLER) liblapack.la $(BLDdir)/gentoo/libs
+
+
 sanity_test :
 	@ echo "BUILDING TESTERS:"
 	cd bin ; $(MAKE) sanity_test
diff -Nru ATLAS.orig/tune/blas/gemm/emit_mm.c ATLAS/tune/blas/gemm/emit_mm.c
--- ATLAS.orig/tune/blas/gemm/emit_mm.c	2006-08-22 17:18:48.000000000 +0200
+++ ATLAS/tune/blas/gemm/emit_mm.c	2006-08-28 21:59:42.000000000 +0200
@@ -2444,6 +2444,12 @@
    assert(fp);
 
    fprintf(fp, "include ../Make.inc\n\n");
+   fprintf(fp, "ICC:=$(LIBTOOL) --tag=CC $(ICC)\n\n");
+   fprintf(fp, "SMC:=$(LIBTOOL) --tag=CC $(SMC)\n\n");
+   fprintf(fp, "DMC:=$(LIBTOOL) --tag=CC $(DMC)\n\n");
+   fprintf(fp, "SKC:=$(LIBTOOL) --tag=CC $(SKC)\n\n");
+   fprintf(fp, "DKC:=$(LIBTOOL) --tag=CC $(DKC)\n\n");
+   fprintf(fp, "XCC:=$(LIBTOOL) --tag=CC $(XCC)\n\n");
    fprintf(fp, "CDEFS2 = $(CDEFS)");
    for (i=0; i < 3; i++)
       if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);
@@ -2523,7 +2529,7 @@
                              wp->NBs[k], wp->imult, wp->fixed, betas[j]);
                   else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);
                      fprintf(fp, "%s.o : %s.c \n", fnam, fnam);
-                  fprintf(fp, "\t%s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",
+		     fprintf(fp, "\t$(LIBTOOL) --tag=CC %s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",
                           wp->CC, betas[j], wp->CCFLAGS, fnam);
                }
             }
diff -Nru ATLAS.orig/tune/blas/gemv/mvsearch.c ATLAS/tune/blas/gemv/mvsearch.c
--- ATLAS.orig/tune/blas/gemv/mvsearch.c	2006-08-22 17:18:48.000000000 +0200
+++ ATLAS/tune/blas/gemv/mvsearch.c	2006-08-28 21:59:42.000000000 +0200
@@ -512,7 +512,7 @@
    fprintf(fp, "include Make.inc\n\n");
 
    if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(%cKC)\n", UPR);
-   else fprintf(fp, "MVNCC = %s\n", ccN);
+   else fprintf(fp, "MVNCC = $(LIBTOOL) --tag=CC %s\n", ccN);
    if (ccN[0] == '\0' && ccflagsN[0] != '\0')
       fprintf(fp, "MVNFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",
               UPR, ccflagsN, typ);
@@ -526,7 +526,7 @@
    }
 
    if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(%cKC)\n", UPR);
-   else fprintf(fp, "MVTCC = %s\n", ccT);
+   else fprintf(fp, "MVTCC = $(LIBTOOL) --tag=CC %s\n", ccT);
    if (ccT[0] == '\0' && ccflagsT[0] != '\0')
       fprintf(fp, "MVTFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n",
               UPR, ccflagsT, typ);
@@ -540,7 +540,7 @@
    }
 
    if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(%cKC)\n", UPR);
-   else fprintf(fp, "MVSCC = %s\n", ccS);
+   else fprintf(fp, "MVSCC = $(LIBTOOL) --tag=CC %s\n", ccS);
    if (ccS[0] == '\0' && ccflagsS[0] != '\0')
       fprintf(fp, "MVSFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s",
               UPR, ccflagsS, typ);
diff -Nru ATLAS.orig/tune/blas/level1/asumsrch.c ATLAS/tune/blas/level1/asumsrch.c
--- ATLAS.orig/tune/blas/level1/asumsrch.c	2006-08-22 17:18:48.000000000 +0200
+++ ATLAS/tune/blas/level1/asumsrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -180,7 +181,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+        /* Gentoo         pcc = cc; */
+	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
+	 strcat(temp, cc);
+	 pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/axpbysrch.c ATLAS/tune/blas/level1/axpbysrch.c
--- ATLAS.orig/tune/blas/level1/axpbysrch.c	2006-08-22 17:18:48.000000000 +0200
+++ ATLAS/tune/blas/level1/axpbysrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -188,7 +189,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+         strcpy(temp, "$(LIBTOOL) --tag=CC ");
+         strcat(temp, cc);
+         pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/axpysrch.c ATLAS/tune/blas/level1/axpysrch.c
--- ATLAS.orig/tune/blas/level1/axpysrch.c	2006-08-22 17:18:48.000000000 +0200
+++ ATLAS/tune/blas/level1/axpysrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -186,7 +187,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+         strcpy(temp, "$(LIBTOOL) --tag=CC ");
+         strcat(temp, cc);
+         pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/copysrch.c ATLAS/tune/blas/level1/copysrch.c
--- ATLAS.orig/tune/blas/level1/copysrch.c	2006-08-22 17:18:48.000000000 +0200
+++ ATLAS/tune/blas/level1/copysrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -180,7 +181,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
+	 strcat(temp, cc);
+	 pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/cpscsrch.c ATLAS/tune/blas/level1/cpscsrch.c
--- ATLAS.orig/tune/blas/level1/cpscsrch.c	2006-08-22 17:18:49.000000000 +0200
+++ ATLAS/tune/blas/level1/cpscsrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -186,7 +187,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+         strcpy(temp, "$(LIBTOOL) --tag=CC ");
+         strcat(temp, cc);
+         pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/dotsrch.c ATLAS/tune/blas/level1/dotsrch.c
--- ATLAS.orig/tune/blas/level1/dotsrch.c	2006-08-22 17:18:49.000000000 +0200
+++ ATLAS/tune/blas/level1/dotsrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -161,6 +161,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -182,7 +183,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+         strcpy(temp, "$(LIBTOOL) --tag=CC ");
+         strcat(temp, cc);
+         pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/iamaxsrch.c ATLAS/tune/blas/level1/iamaxsrch.c
--- ATLAS.orig/tune/blas/level1/iamaxsrch.c	2006-08-22 17:18:49.000000000 +0200
+++ ATLAS/tune/blas/level1/iamaxsrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -179,7 +180,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
+	 strcat(temp, cc);
+	 pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/nrm2srch.c ATLAS/tune/blas/level1/nrm2srch.c
--- ATLAS.orig/tune/blas/level1/nrm2srch.c	2006-08-22 17:18:49.000000000 +0200
+++ ATLAS/tune/blas/level1/nrm2srch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -180,7 +181,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+         strcpy(temp, "$(LIBTOOL) --tag=CC ");
+         strcat(temp, cc);
+         pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/rotsrch.c ATLAS/tune/blas/level1/rotsrch.c
--- ATLAS.orig/tune/blas/level1/rotsrch.c	2006-08-22 17:18:49.000000000 +0200
+++ ATLAS/tune/blas/level1/rotsrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -189,7 +190,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+         strcpy(temp, "$(LIBTOOL) --tag=CC ");
+         strcat(temp, cc);
+         pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/scalsrch.c ATLAS/tune/blas/level1/scalsrch.c
--- ATLAS.orig/tune/blas/level1/scalsrch.c	2006-08-22 17:18:49.000000000 +0200
+++ ATLAS/tune/blas/level1/scalsrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -187,7 +188,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+         strcpy(temp, "$(LIBTOOL) --tag=CC ");
+         strcat(temp, cc);
+         pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/setsrch.c ATLAS/tune/blas/level1/setsrch.c
--- ATLAS.orig/tune/blas/level1/setsrch.c	2006-08-22 17:18:49.000000000 +0200
+++ ATLAS/tune/blas/level1/setsrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -181,7 +182,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+	 strcpy(temp, "$(LIBTOOL) --tag=CC ");
+	 strcat(temp, cc);
+	 pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;
diff -Nru ATLAS.orig/tune/blas/level1/swapsrch.c ATLAS/tune/blas/level1/swapsrch.c
--- ATLAS.orig/tune/blas/level1/swapsrch.c	2006-08-22 17:18:49.000000000 +0200
+++ ATLAS/tune/blas/level1/swapsrch.c	2006-08-28 21:59:43.000000000 +0200
@@ -159,6 +159,7 @@
    FILE *fpin;
    FILENODE *fbase, *fn, *fp=NULL;
    char ln[512], rout[256], auth[256], cc[256], ccflags[256];
+   char temp[256];
    char *pcc, *pccflags;
    int i, n, ID, alpha, beta, incX, incY;
 
@@ -180,7 +181,10 @@
          assert(fgets(ccflags, 512, fpin) != NULL);
          FixFlags(cc);
          FixFlags(ccflags);
-         pcc = cc;
+         /* Gentoo         pcc = cc; */
+         strcpy(temp, "$(LIBTOOL) --tag=CC ");
+         strcat(temp, cc);
+         pcc = temp;
          pccflags = ccflags;
       }
       else pcc = pccflags = NULL;