Merge pull request #132 from turboencabulator/cleanup

Update makefile prerequisites

3 files changed, 40 insertions, 43 deletions

diff --git a/SRC/Makefile b/SRC/Makefile
index d47f7308..5d6fe72c 100644
--- a/SRC/Makefile
+++ b/SRC/Makefile
@@ -44,7 +44,7 @@ include ../make.inc
 #  and is created at the next higher directory level.
 #
 #  To remove the object files after the library is created, enter
-#       make clean
+#       make cleanobj
 #  On some systems, you can force the source files to be recompiled by
 #  entering (for example)
 #       make single FRC=FRC
@@ -508,27 +508,23 @@ endif
 all: ../$(LAPACKLIB)
 
 ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
-	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
+	$(ARCH) $(ARCHFLAGS) $@ $^
 	$(RANLIB) $@
 
 single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
-	$(SXLASRC) $(SCLAUX) $(ALLAUX)
+	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $^
 	$(RANLIB) ../$(LAPACKLIB)
 
 complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX)
-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
-	$(CXLASRC) $(SCLAUX) $(ALLAUX)
+	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $^
 	$(RANLIB) ../$(LAPACKLIB)
 
 double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX)
-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
-	$(DXLASRC) $(DZLAUX) $(ALLAUX)
+	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $^
 	$(RANLIB) ../$(LAPACKLIB)
 
 complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX)
-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
-	$(ZXLASRC) $(DZLAUX) $(ALLAUX)
+	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $^
 	$(RANLIB) ../$(LAPACKLIB)
 
 $(ALLAUX): $(FRC)
@@ -550,12 +546,14 @@ endif
 FRC:
 	@FRC=$(FRC)
 
-clean:
+clean: cleanobj cleanlib
+cleanobj:
 	rm -f *.o DEPRECATED/*.o
+cleanlib:
+	rm -f ../$(LAPACKLIB)
 
 .f.o:
 	$(FORTRAN) $(OPTS) -c -o $@ $<
-
 .F.o:
 	$(FORTRAN) $(OPTS) -c -o $@ $<
 
diff --git a/SRC/VARIANTS/Makefile b/SRC/VARIANTS/Makefile
index 6db97e95..9f141075 100644
--- a/SRC/VARIANTS/Makefile
+++ b/SRC/VARIANTS/Makefile
@@ -17,8 +17,6 @@ include ../../make.inc
 #  1065-1081. http://dx.doi.org/10.1137/S0895479896297744
 #######################################################################
 
-VARIANTSDIR = LIB
-
 CHOLRL = cholesky/RL/cpotrf.o cholesky/RL/dpotrf.o cholesky/RL/spotrf.o cholesky/RL/zpotrf.o
 
 CHOLTOP = cholesky/TOP/cpotrf.o cholesky/TOP/dpotrf.o cholesky/TOP/spotrf.o cholesky/TOP/zpotrf.o
@@ -32,36 +30,37 @@ LUREC = lu/REC/cgetrf.o lu/REC/dgetrf.o lu/REC/sgetrf.o lu/REC/zgetrf.o
 QRLL = qr/LL/cgeqrf.o qr/LL/dgeqrf.o qr/LL/sgeqrf.o qr/LL/zgeqrf.o qr/LL/sceil.o
 
 
-all: cholrl choltop lucr lull lurec qrll
+all: cholrl.a choltop.a lucr.a lull.a lurec.a qrll.a
 
-cholrl: $(CHOLRL)
-	$(ARCH) $(ARCHFLAGS) $(VARIANTSDIR)/cholrl.a $(CHOLRL)
-	$(RANLIB) $(VARIANTSDIR)/cholrl.a
+cholrl.a: $(CHOLRL)
+	$(ARCH) $(ARCHFLAGS) $@ $^
+	$(RANLIB) $@
 
-choltop: $(CHOLTOP)
-	$(ARCH) $(ARCHFLAGS) $(VARIANTSDIR)/choltop.a $(CHOLTOP)
-	$(RANLIB) $(VARIANTSDIR)/choltop.a
+choltop.a: $(CHOLTOP)
+	$(ARCH) $(ARCHFLAGS) $@ $^
+	$(RANLIB) $@
 
-lucr: $(LUCR)
-	$(ARCH) $(ARCHFLAGS) $(VARIANTSDIR)/lucr.a $(LUCR)
-	$(RANLIB) $(VARIANTSDIR)/lucr.a
+lucr.a: $(LUCR)
+	$(ARCH) $(ARCHFLAGS) $@ $^
+	$(RANLIB) $@
 
-lull: $(LULL)
-	$(ARCH) $(ARCHFLAGS) $(VARIANTSDIR)/lull.a $(LULL)
-	$(RANLIB) $(VARIANTSDIR)/lull.a
+lull.a: $(LULL)
+	$(ARCH) $(ARCHFLAGS) $@ $^
+	$(RANLIB) $@
 
-lurec: $(LUREC)
-	$(ARCH) $(ARCHFLAGS) $(VARIANTSDIR)/lurec.a $(LUREC)
-	$(RANLIB) $(VARIANTSDIR)/lurec.a
+lurec.a: $(LUREC)
+	$(ARCH) $(ARCHFLAGS) $@ $^
+	$(RANLIB) $@
 
-qrll: $(QRLL)
-	$(ARCH) $(ARCHFLAGS) $(VARIANTSDIR)/qrll.a $(QRLL)
-	$(RANLIB) $(VARIANTSDIR)/qrll.a
+qrll.a: $(QRLL)
+	$(ARCH) $(ARCHFLAGS) $@ $^
+	$(RANLIB) $@
 
+clean: cleanobj cleanlib
+cleanobj:
+	rm -f $(CHOLRL) $(CHOLTOP) $(LUCR) $(LULL) $(LUREC) $(QRLL)
+cleanlib:
+	rm -f *.a
 
 .f.o:
 	$(FORTRAN) $(OPTS) -c -o $@ $<
-
-clean:
-	rm -f $(CHOLRL) $(CHOLTOP) $(LUCR) $(LULL) $(LUREC) $(QRLL) \
-	      $(VARIANTSDIR)/*.a
diff --git a/SRC/VARIANTS/README b/SRC/VARIANTS/README
index c2062151..4d301cc6 100644
--- a/SRC/VARIANTS/README
+++ b/SRC/VARIANTS/README
@@ -1,5 +1,5 @@
-   		   ===============
- 		   = README File =
+		   ===============
+		   = README File =
 		   ===============
 
 This README File is for the LAPACK driver variants.
@@ -34,10 +34,10 @@ References:For a more detailed description please refer to
 =========
 
 These variants are compiled by default in the build process but they are not tested by default.
-The build process creates one new library per variants in the four arithmetics (singel/double/comple/double complex).
-The libraries are in the SRC/VARIANTS/LIB directory.
+The build process creates one new library per variants in the four arithmetics (single real/double real/single complex/double complex).
+The libraries are in the SRC/VARIANTS directory.
 
-Corresponding libraries created in SRC/VARIANTS/LIB:
+Corresponding libraries created in SRC/VARIANTS:
 	- LU Crout : lucr.a
 	- LU Left Looking : lull.a
 	- LU Sivan Toledo's recursive : lurec.a
@@ -73,7 +73,7 @@ Default using LU Right Looking version:
 
 Using LU Left Looking version:
  $(FORTRAN) -c myprog.f
- $(FORTRAN) -o myexe myprog.o $(PATH TO LAPACK/SRC/VARIANTS/LIB)/lull.a $(LAPACKLIB) $(BLASLIB)
+ $(FORTRAN) -o myexe myprog.o $(PATH TO LAPACK/SRC/VARIANTS)/lull.a $(LAPACKLIB) $(BLASLIB)
 
 ===========
 = SUPPORT =