Avoid rebuilding CBLAS library and examples

Use targets that are actual filenames so that make can determine if the
target is already up-to-date.

Since $(CBLASLIB) is a relative path, delete it from a Makefile at the
right depth.

diff --git a/.gitignore b/.gitignore
index 051cb7d..1e3c726 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,17 @@ make.inc
 BLAS/TESTING/*.out
 BLAS/TESTING/x*
 
+# CBLAS
+CBLAS/include/cblas_mangling.h
+
+# CBLAS testing
+CBLAS/testing/*.out
+CBLAS/testing/x*
+
+# CBLAS examples
+CBLAS/examples/cblas_ex1
+CBLAS/examples/cblas_ex2
+
 # LAPACK testing
 TESTING/x*
 TESTING/*.out

diff --git a/CBLAS/Makefile b/CBLAS/Makefile
index 5a398f8..3ba1f71 100644 (file)
--- a/CBLAS/Makefile
+++ b/CBLAS/Makefile
@@ -14,8 +14,8 @@ cleanexe:
        cd testing && $(MAKE) cleanexe
 
 cleanall: clean cleanexe
-       rm -f $(CBLASLIB)
-       cd examples && rm -f *.o cblas_ex1 cblas_ex2
+       cd src && $(MAKE) cleanall
+       cd examples && $(MAKE) cleanall
 
 cblas_testing:
        cd testing && $(MAKE) all

diff --git a/CBLAS/examples/Makefile b/CBLAS/examples/Makefile
index 1d416a8..ded5ed9 100644 (file)
--- a/CBLAS/examples/Makefile
+++ b/CBLAS/examples/Makefile
@@ -1,14 +1,14 @@
 include ../../make.inc
 
-all: example1 example2
+all: cblas_ex1 cblas_ex2
 
-example1:
-       $(CC) $(CFLAGS) -I../include -c cblas_example1.c
-       $(LOADER) $(LOADOPTS) -o cblas_ex1 cblas_example1.o $(CBLASLIB) $(BLASLIB)
-
-example2:
-       $(CC) $(CFLAGS) -I../include -c cblas_example2.c
-       $(LOADER) $(LOADOPTS) -o cblas_ex2 cblas_example2.o $(CBLASLIB) $(BLASLIB)
+cblas_ex1: cblas_example1.o
+       $(LOADER) $(LOADOPTS) -o $@ cblas_example1.o $(CBLASLIB) $(BLASLIB)
+cblas_ex2: cblas_example2.o
+       $(LOADER) $(LOADOPTS) -o $@ cblas_example2.o $(CBLASLIB) $(BLASLIB)
 
 cleanall:
        rm -f *.o cblas_ex1 cblas_ex2
+
+.c.o:
+       $(CC) $(CFLAGS) -I../include -c -o $@ $<

diff --git a/CBLAS/src/Makefile b/CBLAS/src/Makefile
index 1fa91b2..660c620 100644 (file)
--- a/CBLAS/src/Makefile
+++ b/CBLAS/src/Makefile
@@ -2,10 +2,7 @@
 
 include ../../make.inc
 
-all: cblaslib
-
-clean:
-       rm -f *.o a.out core
+all: $(CBLASLIB)
 
 # Error handling routines for level 2 & 3
 errhand = cblas_globals.o cblas_xerbla.o xerbla.o
@@ -185,13 +182,18 @@ all3: $(alev3) $(errhand)
        $(RANLIB) $(CBLASLIB)
 
 # All levels and precisions
-cblaslib: $(alev1) $(alev2) $(alev3) $(errhand)
-       $(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(alev1) $(alev2) $(alev3) $(errhand)
-       $(RANLIB) $(CBLASLIB)
+$(CBLASLIB): $(alev1) $(alev2) $(alev3) $(errhand)
+       $(ARCH) $(ARCHFLAGS) $@ $(alev1) $(alev2) $(alev3) $(errhand)
+       $(RANLIB) $@
 
 FRC:
        @FRC=$(FRC)
 
+clean:
+       rm -f *.o a.out core
+cleanall:
+       rm -f $(CBLASLIB)
+
 .c.o:
        $(CC) $(CFLAGS) -I../include -c -o $@ $<