static_full_blas_lapack

Gbp-Pq: Name static_full_blas_lapack.diff

diff --git a/CONFIG/src/Makefile b/CONFIG/src/Makefile
index 8eb38f7d9ff80974d57062adc52d2c53ddfe778c..168b4800c35b6bad55182d4bb4968742fa821775 100644 (file)
--- a/CONFIG/src/Makefile
+++ b/CONFIG/src/Makefile
@@ -575,7 +575,7 @@ $(LIBINSTdir) :
        chmod 0755 $(LIBINSTdir)
 install : $(INCINSTdir) $(LIBINSTdir) $(INCINSTdir)/atlas
        $(MAKE) -f Make.top install_inc INSTdir=$(INCINSTdir) 
-       $(MAKE) -f Make.top install_lib INSTdir=$(LIBINSTdir)
+       $(MAKE) -f Make.top install_static_lib INSTdir=$(LIBINSTdir)
 
 confclean: $(CLEANdep)
        rm -f *core* *.o config?.out

diff --git a/CONFIG/src/SpewMakeInc.c b/CONFIG/src/SpewMakeInc.c
index 9f093f06dc095df0b0e1963f4a290f78b18afd00..8ad3fba9d2061533b9e309efa912447575c9a5f8 100644 (file)
--- a/CONFIG/src/SpewMakeInc.c
+++ b/CONFIG/src/SpewMakeInc.c
@@ -604,6 +604,9 @@ int main(int nargs, char **args)
    }
    fprintf(fpout, "   TESTlib = $(LIBdir)/libtstatlas.a\n\n");
 
+   fprintf(fpout, "   FULLBLASlib = $(LIBdir)/atlas/libblas.a\n");
+   fprintf(fpout, "   FULLLAPACKlib = $(LIBdir)/atlas/liblapack.a\n");
+
    fprintf(fpout, "#  -------------------------------------------\n");
    fprintf(fpout, "#  Upper bound on largest cache size, in bytes\n");
    fprintf(fpout, "#  -------------------------------------------\n");

diff --git a/Make.top b/Make.top
index 43e45d70050d9fa334e8378228358a2683a7f8a9..de3b7ca159cbc8156ca9897accd69b24d069b012 100644 (file)
--- a/Make.top
+++ b/Make.top
@@ -14,6 +14,9 @@ leafstart:
 build:
        cd bin/ ; $(MAKE) xatlas_build
        cd bin/ ; ./xatlas_build $(INSTFLAGS)
+       cd lib/ ; $(MAKE) atlas/libblas.a
+       cd lib/ ; $(MAKE) atlas/liblapack.a
+
 time: 
        ./xatlbench -dc $(BLDdir)/bin/INSTALL_LOG -dp $(BLDdir)/ARCHS/$(ARCH)
 C_sanity_test:
@@ -401,6 +404,7 @@ startup : lib include results EXtest
        $(MAKE) -f Make.top leafstart leaf=src/blas/reference/level1
        $(MAKE) -f Make.top leafstart leaf=src/auxil
        $(MAKE) -f Make.top leafstart leaf=src/testing
+       $(MAKE) -f Make.top leafstart leaf=lib/atlas
        $(MAKE) -f Make.top leafstart leaf=lib
        $(MAKE) -f Make.top leafstart leaf=bin
        cd src/threads ; touch atomic.inc
@@ -591,6 +595,7 @@ killgrd :
 
 lib :
        mkdir lib
+       mkdir lib/atlas
 
 include:
        mkdir include
@@ -654,12 +659,17 @@ install_inc:
        chmod 0644 $(INSTdir)/cblas.h $(INSTdir)/clapack.h
        cp $(INCAdir)/* $(INSTdir)/atlas/.
        - chmod 0644 $(INSTdir)/atlas/*
-install_lib:
+
+install_static_lib:
        cp $(LIBdir)/libatlas.a $(INSTdir)/.
        cp $(LIBdir)/libcblas.a $(INSTdir)/.
        cp $(LIBdir)/liblapack_atlas.a $(INSTdir)/.
+       mkdir -p $(INSTdir)/atlas
+       cp $(LIBdir)/atlas/libblas.a $(INSTdir)/atlas/.
+       cp $(LIBdir)/atlas/liblapack.a $(INSTdir)/atlas/.
        chmod 0644 $(INSTdir)/libatlas.a  $(INSTdir)/liblapack_atlas.a \
-                   $(INSTdir)/libcblas.a 
+                   $(INSTdir)/libcblas.a $(INSTdir)/atlas/libblas.a \
+                  $(INSTdir)/atlas/liblapack.a 
        - cp $(LIBdir)/libf77blas.a $(INSTdir)/.
        - chmod 0644 $(INSTdir)/libf77blas.a
        - cp $(LIBdir)/libptcblas.a $(INSTdir)/.

diff --git a/makes/Make.lib b/makes/Make.lib
index 7a33a34c363346eb6d27173d6c1510b5be9168c2..c156ea9977ba98ffe963bc5c55b3ae9efebb9abc 100644 (file)
--- a/makes/Make.lib
+++ b/makes/Make.lib
@@ -175,6 +175,36 @@ TRYALL :
            LIBS="$(LIBS)" LIBINSTdir="$(LIBINSTdir)" ; \
         fi
 
+
+# Build full netlib blas/lapack libraries:
+atlas/libblas.a: libatlas.a
+       mkdir tmp
+       cd tmp && \
+               ar x ../libatlas.a && \
+               if test -f ../libptf77blas.a -a -f ../libptcblas.a; then \
+                       ar x ../libptf77blas.a && \
+                       ar x ../libptcblas.a; \
+               else \
+                       ar x ../libf77blas.a && \
+                       ar x ../libcblas.a; \
+               fi
+       ar r $@ tmp/*.o
+       rm -rf tmp
+
+atlas/liblapack.a: liblapack_atlas.a libatlas.a
+       mkdir tmp
+       cd tmp && \
+               ar x /usr/lib/liblapack_pic.a && \
+               ar x ../liblapack_atlas.a && \
+               if test -f ../libptcblas.a; then \
+                       ar x ../libptcblas.a; \
+               else \
+                       ar x ../libcblas.a; \
+               fi
+       ar r $@ tmp/*.o
+       rm -rf tmp
+
+
 #
 # Builds one shared lib from all ATLAS files
 #