Attachment #25939 for bug #30453




install:
	cd bin/$(arch) ; $(MAKE) xatlas_install
	cd bin/$(arch) ; ./xatlas_install -d $(ARCHDEF) $(MMDEF) $(INSTFLAGS)

shared: INSTALLER = cp
shared: RPATH = /usr/lib/blas/atlas
shared: libatlas.so libblas.so libcblas.so

shared-strip: INSTALLER = install -s
shared-strip: RPATH = /usr/lib/blas/atlas
shared-strip: libatlas.so libblas.so libcblas.so

ptshared: INSTALLER = cp
ptshared: RPATH = /usr/lib/blas/threaded-atlas
ptshared: libptblas.so libptcblas.so

ptshared-strip: INSTALLER = install -s
ptshared-strip: RPATH = /usr/lib/blas/threaded-atlas
ptshared-strip: libptblas.so libptcblas.so

liblapack.so: RPATH = /usr/lib/lapack/atlas

libatlas.so:
	mkdir -p gentoo/libs
	cd gentoo/libatlas.a ; \
	libtool --mode=link $(CC) -o libatlas.la *.lo -rpath /usr/lib ; \
	libtool $(INSTALLER) libatlas.la $(TOPdir)/gentoo/libs

# libg2c is part of GNU gcc. It is listed here as a dependency for the F77
# BLAS libraries in case the user wants to link with the libraries using
# the Intel Fortran Compiler. The issue is with xerbla.f, which calls the
# STOP instrinsic. Linking with ifc will result in undefined symbols like
# e_wsfe and others. These symbols are contained in libg2c. If you will not
# use ifc, you most likely want to remove the '-lg2c' from libblas.so
# and possibly libptblas.so. Of course, you can just remove -lg2c, and
# specify it explicitly when using ifc.
libblas.so:
	cd gentoo/libf77blas.a ; \
	libtool --mode=link $(CC) -o libblas.la ../libs/libatlas.la *.lo \
	        -rpath $(RPATH) -lg2c ; \
	libtool $(INSTALLER) libblas.la $(TOPdir)/gentoo/libs

libcblas.so:
	cd gentoo/libcblas.a ; \
	libtool --mode=link $(CC) -o libcblas.la ../libs/libatlas.la *.lo \
	        -rpath $(RPATH) ; \
	libtool $(INSTALLER) libcblas.la $(TOPdir)/gentoo/libs

libptblas.so:
	mkdir -p gentoo/threaded-libs
	cd gentoo/libptf77blas.a ; \
	libtool --mode=link $(CC) -o libblas.la ../libs/libatlas.la *.lo \
		-rpath $(RPATH) -lg2c -lpthread ; \
	libtool $(INSTALLER) libblas.la $(TOPdir)/gentoo/threaded-libs

libptcblas.so:
	cd gentoo/libptcblas.a ; \
	libtool --mode=link $(CC) -o libcblas.la ../libs/libatlas.la *.lo \
		-rpath $(RPATH) -lpthread ; \
	libtool $(INSTALLER) libcblas.la $(TOPdir)/gentoo/threaded-libs

liblapack.so:
	mkdir -p gentoo/libs
	cd gentoo/liblapack.a ; \
	libtool --mode=link $(CC) -o liblapack.la *.lo \
	        -rpath $(RPATH) -lblas -lcblas -latlas -lg2c; \
	libtool $(INSTALLER) liblapack.la $(TOPdir)/gentoo/libs

sanity_test :
	@ echo "BUILDING TESTERS:"
	cd bin/$(arch) ; $(MAKE) sanity_test




install :
	$(MAKE) -f Make.top install arch=$(arch)

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)

dup0 :
	$(MAKE) -f Make.top dup0 arch=$(arch) arch0=$(arch0)
dup :




/*
 * If requested, see if we can locate a comparison BLAS
 */
/* Gentoo
   if (F77 && BLASlib)
   {
      GetBlasTry(OS, mach, BLASlib);
      FindBlas(fpout, fplog, redir, F77, F77FLAGS, BLASlib);
   }
 */
/*
 * If using a non-g77 Fortran under Windows, throw the -mno-cygwin for all gcc
 */

            else if (strstr(ln, "Athlon(tm) 64")) mach = AmdHammer64;
            else if (strstr(ln, "Athlon")) mach = AmdAthlon;
            else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;
	    else if (strstr(ln, "XEON")) mach = IntP4; /* Gentoo */
         }
         break;
      default:;

   if (i || ln[0] == '\0' || strstr(ln, "i586") || strstr(ln, "i486") ||
            strstr(ln, "i386"))
   {
#ifndef INTERACTIVE
      exit(-1); /*/ Make ebuild complain. */
#endif
      fprintf(stdout, "Enter your machine type:\n");
      fprintf(stdout, "   1. Other/UNKNOWN\n\n");
      fprintf(stdout, "   2. AMD Athlon\n");

   }
   else if (strstr(ln, "ia64"))
   {
#ifndef INTERACTIVE
      exit(-1); /*/ Make ebuild complain. */
#endif
      fprintf(stdout, "Enter your machine type:\n");
      fprintf(stdout, "   1. Other/UNKNOWN\n");
      fprintf(stdout, "   2. IA-64 Itanium 1\n");

   }
   else if (strstr(ln, "x86_64"))
   {
#ifndef INTERACTIVE
      exit(-1); /*/ Make ebuild complain. */
#endif
      fprintf(stdout, "Enter your machine type:\n");
      fprintf(stdout, "   1. Other/UNKNOWN\n");
      fprintf(stdout, "   2. 32 bit AMD Hammer\n");

   }
   else if (strstr(ln, "i686"))
   {
#ifndef INTERACTIVE
      exit(-1); /* Make ebuild complain. */
#endif
      fprintf(stdout, "Enter your machine type:\n");
      fprintf(stdout, "   1. Other/UNKNOWN\n");
      fprintf(stdout, "   2. AMD Athlon\n");

      if (ierr)
      {
         fprintf(stderr, "File Make.%s already exists!\n", ARCH);
/* Gentoo         ierr = !IsYes('n', "", "overwrite it?"); */
         ierr = !IsYes('y', "", "overwrite it?");
      }
   }
   while (ierr);

   fprintf(fpout, "   MVTdir = $(TOPdir)/tune/blas/gemv/$(ARCH)\n");
   fprintf(fpout, "   R1Tdir = $(TOPdir)/tune/blas/ger/$(ARCH)\n");
   fprintf(fpout, "   L1Tdir = $(TOPdir)/tune/blas/level1/$(ARCH)\n");
   fprintf(fpout, "   L3Tdir = $(TOPdir)/tune/blas/level3/$(ARCH)\n");

   fprintf(fpout,
"#  ---------------------------------------------------------------------\n");

      fprintf(fpout, "   BC = $(CC)\n");
      fprintf(fpout, "   BCFLAGS = $(CCFLAGS)\n");
   }
#ifdef USE_LIBTOOL
   fprintf(fpout, "   LIBTOOL = libtool --mode=compile\n");
   fprintf(fpout, "   ARCHIVER = $(TOPdir)/war %s\n", ARCHIVER);
#else
   fprintf(fpout, "   ARCHIVER = %s\n", ARCHIVER);
#endif
   fprintf(fpout, "   ARFLAGS  = %s\n", ARFLAGS);
   fprintf(fpout, "   RANLIB   = %s\n\n", RANLIB);





include Make.inc
CC:=$(LIBTOOL) $(CC)

ptobj = ATL_ptflushcache.o
obj = ATL_flushcache.o ATL_cputime.o ATL_walltime.o ATL_xerbla.o ATL_lcm.o \


ATL_cputime.o : $(SYSdir)/ATL_cputime.o
	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o
	ln -sf $(SYSdir)/ATL_cputime.lo ATL_cputime.lo
$(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
$(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c
	cd $(SYSdir) ; $(MAKE) ATL_walltime.o
$(SYSdir)/ATL_walltime.c:

Lines 53-63 Link Here

(-)ATLAS/makes/Make.bin (-3 / +3 lines)
53	cd $(TOPdir)/src/blas/level3/$(ARCH) ; $(MAKE) lib	53	cd $(TOPdir)/src/blas/level3/$(ARCH) ; $(MAKE) lib
54	cd $(TOPdir)/src/blas/pklevel3/$(ARCH) ; $(MAKE) lib	54	cd $(TOPdir)/src/blas/pklevel3/$(ARCH) ; $(MAKE) lib
55	cd $(TOPdir)/src/blas/reference/level3/$(ARCH) ; $(MAKE) lib	55	cd $(TOPdir)/src/blas/reference/level3/$(ARCH) ; $(MAKE) lib
56	cd $(TOPdir)/src/lapack/$(ARCH) ; $(MAKE) lib	56	#Gentoo cd $(TOPdir)/src/lapack/$(ARCH) ; $(MAKE) lib
57	cd $(TOPdir)/interfaces/blas/C/src/$(ARCH) ; $(MAKE) all	57	cd $(TOPdir)/interfaces/blas/C/src/$(ARCH) ; $(MAKE) all
58	- cd $(TOPdir)/interfaces/blas/F77/src/$(ARCH) ; $(MAKE) lib	58	- cd $(TOPdir)/interfaces/blas/F77/src/$(ARCH) ; $(MAKE) lib
59	cd $(TOPdir)/interfaces/lapack/C/src/$(ARCH) ; $(MAKE) lib	59	#Gentoo cd $(TOPdir)/interfaces/lapack/C/src/$(ARCH) ; $(MAKE) lib
60	- cd $(TOPdir)/interfaces/lapack/F77/src/$(ARCH) ; $(MAKE) lib	60	#Gentoo - cd $(TOPdir)/interfaces/lapack/F77/src/$(ARCH) ; $(MAKE) lib
61		61
62	error_report :	62	error_report :
63	cd ../.. ; $(MAKE) error_report arch=$(ARCH)	63	cd ../.. ; $(MAKE) error_report arch=$(ARCH)

Lines 1-4 Link Here

(-)ATLAS/makes/Make.cblas (+1 lines)
1	include Make.inc	1	include Make.inc
		2	CC:= $(LIBTOOL) $(CC)
2		3
3	aobj = cblas_xerbla.o cblas_errprn.o	4	aobj = cblas_xerbla.o cblas_errprn.o
4	sptlvl3obj = cblas_sptgemm.o cblas_sptsymm.o cblas_sptsyr2k.o cblas_sptsyrk.o \	5	sptlvl3obj = cblas_sptgemm.o cblas_sptsymm.o cblas_sptsyr2k.o cblas_sptsyrk.o \

Lines 43-48 Link Here

(-)ATLAS/makes/Make.f77blas (+2 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
		47	F77:=$(LIBTOOL) $(F77)
46	#	48	#
47	########################################################################	49	########################################################################
48	#	50	#

Lines 1-5 Link Here

(-)ATLAS/makes/Make.gpmm (+2 lines)
1	include Make.inc	1	include Make.inc
2		2
		3	CC:=$(LIBTOOL) $(CC)
		4
3	all : lib	5	all : lib
4	lib : dlib slib zlib clib	6	lib : dlib slib zlib clib
5	clean : sclean dclean cclean zclean	7	clean : sclean dclean cclean zclean

Lines 1-3 Link Here

(-)ATLAS/makes/Make.l1ptblas (+1 lines)
		1	CC:=$(LIBTOOL) $(CC)
1	slib:	2	slib:
2	dlib:	3	dlib:
3	clib:	4	clib:

Lines 43-48 Link Here

(-)ATLAS/makes/Make.l1ref (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
46	#	47	#
47	########################################################################	48	########################################################################
48	#	49	#




include Make.inc
CC:=$(LIBTOOL) $(CC)

sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o



sgen :
	$(MAKE) Make_srot
	$(MAKE) -f Make_srot lib CC="$(CC)"
	$(MAKE) Make_saxpby
	$(MAKE) -f Make_saxpby lib CC="$(CC)"
	$(MAKE) Make_scpsc
	$(MAKE) -f Make_scpsc lib CC="$(CC)"
	$(MAKE) Make_sset
	$(MAKE) -f Make_sset lib CC="$(CC)"
	$(MAKE) Make_snrm2
	$(MAKE) -f Make_snrm2 lib CC="$(CC)"
	$(MAKE) Make_sasum
	$(MAKE) -f Make_sasum lib CC="$(CC)"
	$(MAKE) Make_sdot
	$(MAKE) -f Make_sdot lib CC="$(CC)"
	$(MAKE) Make_sswap
	$(MAKE) -f Make_sswap lib CC="$(CC)"
	$(MAKE) Make_sscal
	$(MAKE) -f Make_sscal lib CC="$(CC)"
	$(MAKE) Make_scopy
	$(MAKE) -f Make_scopy lib CC="$(CC)"
	$(MAKE) Make_saxpy
	$(MAKE) -f Make_saxpy lib CC="$(CC)"
	$(MAKE) Make_siamax
	$(MAKE) -f Make_siamax lib CC="$(CC)"
slvl1 : slib
slib :   slib.grd
	$(MAKE) sgen

	rm -f $(sobj) s*.grd
dgen :
	$(MAKE) Make_drot
	$(MAKE) -f Make_drot lib CC="$(CC)"
	$(MAKE) Make_daxpby
	$(MAKE) -f Make_daxpby lib CC="$(CC)"
	$(MAKE) Make_dcpsc
	$(MAKE) -f Make_dcpsc lib CC="$(CC)"
	$(MAKE) Make_dset
	$(MAKE) -f Make_dset lib CC="$(CC)"
	$(MAKE) Make_dnrm2
	$(MAKE) -f Make_dnrm2 lib CC="$(CC)"
	$(MAKE) Make_dasum
	$(MAKE) -f Make_dasum lib CC="$(CC)"
	$(MAKE) Make_ddot
	$(MAKE) -f Make_ddot lib CC="$(CC)"
	$(MAKE) Make_dswap
	$(MAKE) -f Make_dswap lib CC="$(CC)"
	$(MAKE) Make_dscal
	$(MAKE) -f Make_dscal lib CC="$(CC)"
	$(MAKE) Make_dcopy
	$(MAKE) -f Make_dcopy lib CC="$(CC)"
	$(MAKE) Make_daxpy
	$(MAKE) -f Make_daxpy lib CC="$(CC)"
	$(MAKE) Make_diamax
	$(MAKE) -f Make_diamax lib CC="$(CC)"
dlvl1 : dlib
dlib :   dlib.grd
	$(MAKE) dgen

	rm -f $(dobj) d*.grd
cgen :
	$(MAKE) Make_crot
	$(MAKE) -f Make_crot lib CC="$(CC)"
	$(MAKE) Make_caxpby
	$(MAKE) -f Make_caxpby lib CC="$(CC)"
	$(MAKE) Make_ccpsc
	$(MAKE) -f Make_ccpsc lib CC="$(CC)"
	$(MAKE) Make_cset
	$(MAKE) -f Make_cset lib CC="$(CC)"
	$(MAKE) Make_cnrm2
	$(MAKE) -f Make_cnrm2 lib CC="$(CC)"
	$(MAKE) Make_casum
	$(MAKE) -f Make_casum lib CC="$(CC)"
	$(MAKE) Make_cdot
	$(MAKE) -f Make_cdot lib CC="$(CC)"
	$(MAKE) Make_cswap
	$(MAKE) -f Make_cswap lib CC="$(CC)"
	$(MAKE) Make_cscal
	$(MAKE) -f Make_cscal lib CC="$(CC)"
	$(MAKE) Make_ccopy
	$(MAKE) -f Make_ccopy lib CC="$(CC)"
	$(MAKE) Make_caxpy
	$(MAKE) -f Make_caxpy lib CC="$(CC)"
	$(MAKE) Make_ciamax
	$(MAKE) -f Make_ciamax lib CC="$(CC)"
	$(MAKE) Make_cdotc
	$(MAKE) -f Make_cdotc lib CC="$(CC)"
clvl1 : clib
clib : slib clib.grd
	$(MAKE) cgen

	rm -f $(cobj) c*.grd
zgen :
	$(MAKE) Make_zrot
	$(MAKE) -f Make_zrot lib CC="$(CC)"
	$(MAKE) Make_zaxpby
	$(MAKE) -f Make_zaxpby lib CC="$(CC)"
	$(MAKE) Make_zcpsc
	$(MAKE) -f Make_zcpsc lib CC="$(CC)"
	$(MAKE) Make_zset
	$(MAKE) -f Make_zset lib CC="$(CC)"
	$(MAKE) Make_znrm2
	$(MAKE) -f Make_znrm2 lib CC="$(CC)"
	$(MAKE) Make_zasum
	$(MAKE) -f Make_zasum lib CC="$(CC)"
	$(MAKE) Make_zdot
	$(MAKE) -f Make_zdot lib CC="$(CC)"
	$(MAKE) Make_zswap
	$(MAKE) -f Make_zswap lib CC="$(CC)"
	$(MAKE) Make_zscal
	$(MAKE) -f Make_zscal lib CC="$(CC)"
	$(MAKE) Make_zcopy
	$(MAKE) -f Make_zcopy lib CC="$(CC)"
	$(MAKE) Make_zaxpy
	$(MAKE) -f Make_zaxpy lib CC="$(CC)"
	$(MAKE) Make_ziamax
	$(MAKE) -f Make_ziamax lib CC="$(CC)"
	$(MAKE) Make_zdotc
	$(MAKE) -f Make_zdotc lib CC="$(CC)"
zlvl1 : zlib
zlib : dlib zlib.grd
	$(MAKE) zgen

Lines 43-48 Link Here

(-)ATLAS/makes/Make.l2 (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
46	#	47	#
47	########################################################################	48	########################################################################
48	#	49	#

Lines 43-48 Link Here

(-)ATLAS/makes/Make.l2aux (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
46	#	47	#
47	########################################################################	48	########################################################################
48	#	49	#

Lines 1-3 Link Here

(-)ATLAS/makes/Make.l2ptblas (+1 lines)
		1	CC:=$(LIBTOOL) $(CC)
1	slib:	2	slib:
2	dlib:	3	dlib:
3	clib:	4	clib:

Lines 43-48 Link Here

(-)ATLAS/makes/Make.l2ref (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
46	#	47	#
47	########################################################################	48	########################################################################
48	#	49	#

Lines 1-4 Link Here

(-)ATLAS/makes/Make.l2src (+1 lines)
1	include Make.inc	1	include Make.inc
		2	CC:=$(LIBTOOL) $(CC)
2		3
3	sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \	4	sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \
4	ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \	5	ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \

Lines 43-48 Link Here

(-)ATLAS/makes/Make.l3 (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
46	#	47	#
47	########################################################################	48	########################################################################
48	#	49	#

Lines 43-48 Link Here

(-)ATLAS/makes/Make.l3aux (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
46	#	47	#
47	########################################################################	48	########################################################################
48	#	49	#

Lines 1-4 Link Here

(-)ATLAS/makes/Make.l3kern (+1 lines)
1	include Make.inc	1	include Make.inc
		2	CC:=$(LIBTOOL) $(CC)
2		3
3	sobj = ATL_ssycopyL_a1.o ATL_ssycopyL_aX.o ATL_ssycopyU_a1.o \	4	sobj = ATL_ssycopyL_a1.o ATL_ssycopyL_aX.o ATL_ssycopyU_a1.o \
4	ATL_ssycopyU_aX.o ATL_ssymmLL.o ATL_ssymmLU.o ATL_ssymmRL.o \	5	ATL_ssycopyU_aX.o ATL_ssymmLL.o ATL_ssymmLU.o ATL_ssymmRL.o \

Lines 43-48 Link Here

(-)ATLAS/makes/Make.l3ptblas (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
46	#	47	#
47	########################################################################	48	########################################################################
48	#	49	#

Lines 43-48 Link Here

(-)ATLAS/makes/Make.l3ref (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
46	#	47	#
47	########################################################################	48	########################################################################
48	#	49	#

Lines 43-48 Link Here

(-)ATLAS/makes/Make.miptblas (+1 lines)
43	########################################################################	43	########################################################################
44	#	44	#
45	include Make.inc	45	include Make.inc
		46	CC:=$(LIBTOOL) $(CC)
46	#	47	#
47	########################################################################	48	########################################################################
48	#	49	#

Lines 1-4 Link Here

(-)ATLAS/makes/Make.mmsrc (-4 / +6 lines)
1	include Make.inc	1	include Make.inc
		2	CC:=$(LIBTOOL) $(CC)
		3	MCC:=$(LIBTOOL) $(MCC)
2		4
3	$(INCdir)/atlas_type.h :	5	$(INCdir)/atlas_type.h :
4	cd $(SYSdir) ; $(MAKE) RunTyp	6	cd $(SYSdir) ; $(MAKE) RunTyp
Lines 77-83 Link Here
77	sclean :	79	sclean :
78	rm -f $(sobj) s*.grd	80	rm -f $(sobj) s*.grd
79	scleanuplib :	81	scleanuplib :
80	cd KERNEL ; $(MAKE) -f sMakefile slib	82	cd KERNEL ; $(MAKE) -f sMakefile slib MCC="$(MCC)"
81		83
82	slib :	84	slib :
83	$(MAKE) auxillib scleanuplib susergemm	85	$(MAKE) auxillib scleanuplib susergemm
Lines 190-196 Link Here
190	dclean :	192	dclean :
191	rm -f $(dobj) d*.grd	193	rm -f $(dobj) d*.grd
192	dcleanuplib :	194	dcleanuplib :
193	cd KERNEL ; $(MAKE) -f dMakefile dlib	195	cd KERNEL ; $(MAKE) -f dMakefile dlib MCC="$(MCC)"
194		196
195	dlib :	197	dlib :
196	$(MAKE) auxillib dcleanuplib dusergemm	198	$(MAKE) auxillib dcleanuplib dusergemm
Lines 303-309 Link Here
303	cclean :	305	cclean :
304	rm -f $(cobj) c*.grd	306	rm -f $(cobj) c*.grd
305	ccleanuplib :	307	ccleanuplib :
306	cd KERNEL ; $(MAKE) -f cMakefile clib	308	cd KERNEL ; $(MAKE) -f cMakefile clib MCC="$(MCC)"
307		309
308	clib :	310	clib :
309	$(MAKE) auxillib ccleanuplib cusergemm	311	$(MAKE) auxillib ccleanuplib cusergemm
Lines 480-486 Link Here
480	zclean :	482	zclean :
481	rm -f $(zobj) z*.grd	483	rm -f $(zobj) z*.grd
482	zcleanuplib :	484	zcleanuplib :
483	cd KERNEL ; $(MAKE) -f zMakefile zlib	485	cd KERNEL ; $(MAKE) -f zMakefile zlib MCC="$(MCC)"
484		486
485	zlib :	487	zlib :
486	$(MAKE) auxillib zcleanuplib zusergemm	488	$(MAKE) auxillib zcleanuplib zusergemm




include Make.inc
CC:=$(LIBTOOL) $(CC)

sobj = ATL_sgemv.o


clean : sclean dclean cclean zclean

dlib : 
	$(PMAKE) -f Make_dmv dlib CC="$(CC)"
	$(PMAKE) dlib.grd
dlib.grd : $(dobj)
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)

dclean : 
	rm -f $(dobj) d*.grd
slib : 
	$(PMAKE) -f Make_smv slib CC="$(CC)"
	$(PMAKE) slib.grd
slib.grd : $(sobj)
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)

sclean : 
	rm -f $(sobj) s*.grd
clib : 
	$(PMAKE) -f Make_cmv clib CC="$(CC)"
	$(PMAKE) clib.grd
clib.grd : $(cobj)
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)

cclean : 
	rm -f $(cobj) c*.grd
zlib : 
	$(PMAKE) -f Make_zmv zlib CC="$(CC)"
	$(PMAKE) zlib.grd
zlib.grd : $(zobj)
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)

Lines 1-5 Link Here

(-)ATLAS/makes/Make.pkl3 (+2 lines)
1	include Make.inc	1	include Make.inc
2		2
		3	CC:=$(LIBTOOL) $(CC)
		4
3	all : lib	5	all : lib
4	lib : dlib slib zlib clib	6	lib : dlib slib zlib clib
5	clean : sclean dclean cclean zclean	7	clean : sclean dclean cclean zclean




include Make.inc
CC:=$(LIBTOOL) $(CC)

sobj = ATL_sger.o
dobj = ATL_dger.o


dlib :
	$(PMAKE) dlib.grd
	$(PMAKE) -f Make_dr1 lib CC="$(CC)"
dlib.grd : $(dobj)
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
	$(RANLIB) $(ATLASlib)

	rm -f $(dobj) d*.grd
slib :
	$(PMAKE) slib.grd
	$(PMAKE) -f Make_sr1 lib CC="$(CC)"
slib.grd : $(sobj)
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
	$(RANLIB) $(ATLASlib)

	rm -f $(sobj) s*.grd
clib :
	$(PMAKE) clib.grd
	$(PMAKE) -f Make_cr1 lib CC="$(CC)"
clib.grd : $(cobj)
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
	$(RANLIB) $(ATLASlib)

	rm -f $(cobj) c*.grd
zlib :
	$(PMAKE) zlib.grd
	$(PMAKE) -f Make_zr1 lib CC="$(CC)"
zlib.grd : $(zobj)
	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
	$(RANLIB) $(ATLASlib)

Lines 1-5 Link Here

(-)ATLAS/makes/Make.sprk (+2 lines)
1	include Make.inc	1	include Make.inc
2		2
		3	CC:=$(LIBTOOL) $(CC)
		4
3	all : lib	5	all : lib
4	lib : dlib slib zlib clib	6	lib : dlib slib zlib clib
5	clean : sclean dclean cclean zclean	7	clean : sclean dclean cclean zclean




ATL_cputime.c : 
	cp ../ATL_cputime.c .
ATL_cputime.o : ATL_cputime.c
	$(LIBTOOL) $(CC) -c $(CCFLAGS) ATL_cputime.c

ATL_walltime.c : 
	cp ../ATL_walltime.c .
ATL_walltime.o : ATL_walltime.c
	$(LIBTOOL) $(CC) -c $(CCFLAGS) ATL_walltime.c

ATL_Xwalltime.o : ATL_walltime.o
	$(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c

Lines 2218-2223 Link Here

(-)ATLAS/tune/blas/gemm/emit_mm.c (-1 / +2 lines)
2218	assert(fp);	2218	assert(fp);
2219		2219
2220	fprintf(fp, "include ../Make.inc\n\n");	2220	fprintf(fp, "include ../Make.inc\n\n");
		2221	fprintf(fp, "CC:=$(LIBTOOL) $(CC)\n\n");
2221	fprintf(fp, "CDEFS2 = $(CDEFS)");	2222	fprintf(fp, "CDEFS2 = $(CDEFS)");
2222	for (i=0; i < 3; i++)	2223	for (i=0; i < 3; i++)
2223	if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);	2224	if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]);
Lines 2297-2303 Link Here
2297	wp->NBs[k], wp->imult, wp->fixed, betas[j]);	2298	wp->NBs[k], wp->imult, wp->fixed, betas[j]);
2298	else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);	2299	else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]);
2299	fprintf(fp, "%s.o : %s.c \n", fnam, fnam);	2300	fprintf(fp, "%s.o : %s.c \n", fnam, fnam);
2300	fprintf(fp, "\t%s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",	2301	fprintf(fp, "\t$(LIBTOOL) %s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n",
2301	wp->CC, betas[j], wp->CCFLAGS, fnam);	2302	wp->CC, betas[j], wp->CCFLAGS, fnam);
2302	}	2303	}
2303	}	2304	}




   assert(fp);
   fprintf(fp, "include Make.inc\n\n");

   if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(LIBTOOL) $(CC)\n");
   else fprintf(fp, "MVNCC = $(LIBTOOL) %s\n", ccN);
   if (ccN[0] == '\0' && ccflagsN[0] != '\0')
      fprintf(fp, "MVNFLAGS = $(CCFLAGS) %s -D%s\n", ccflagsN, typ);
   else if (ccflagsN[0] != '\0')

      fprintf(fp, "MVNcFLAGS = $(MVNFLAGS) -DConj_\n\n");
   }

   if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(LIBTOOL) $(CC)\n");
   else fprintf(fp, "MVTCC = $(LIBTOOL) %s\n", ccT);
   if (ccT[0] == '\0' && ccflagsT[0] != '\0')
      fprintf(fp, "MVTFLAGS = $(CCFLAGS) %s -D%s\n", ccflagsT, typ);
   else if (ccflagsT[0] != '\0')

   }

   if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(CC)\n");
   else fprintf(fp, "MVSCC = $(LIBTOOL) %s\n", ccS);
   if (ccS[0] == '\0' && ccflagsS[0] != '\0')
      fprintf(fp, "MVSFLAGS = $(CCFLAGS) %s -D%s", ccflagsS, typ);
   else if (ccflagsS[0] != '\0')

Lines 159-164 Link Here

(-)ATLAS/tune/blas/level1/asumsrch.c (-1 / +5 lines)
159	FILE *fpin;	159	FILE *fpin;
160	FILENODE fbase, fn, *fp=NULL;	160	FILENODE fbase, fn, *fp=NULL;
161	char ln[512], rout[256], auth[256], cc[256], ccflags[256];	161	char ln[512], rout[256], auth[256], cc[256], ccflags[256];
		162	char temp[256];
162	char pcc, pccflags;	163	char pcc, pccflags;
163	int i, n, ID, alpha, beta, incX, incY;	164	int i, n, ID, alpha, beta, incX, incY;
164		165
Lines 180-186 Link Here
180	assert(fgets(ccflags, 512, fpin) != NULL);	181	assert(fgets(ccflags, 512, fpin) != NULL);
181	FixFlags(cc);	182	FixFlags(cc);
182	FixFlags(ccflags);	183	FixFlags(ccflags);
183	pcc = cc;	184	/* Gentoo pcc = cc; */
		185	strcpy(temp, "$(LIBTOOL) ");
		186	strcat(temp, cc);
		187	pcc = temp;
184	pccflags = ccflags;	188	pccflags = ccflags;
185	}	189	}
186	else pcc = pccflags = NULL;	190	else pcc = pccflags = NULL;

Lines 159-164 Link Here

(-)ATLAS/tune/blas/level1/copysrch.c (-1 / +5 lines)
159	FILE *fpin;	159	FILE *fpin;
160	FILENODE fbase, fn, *fp=NULL;	160	FILENODE fbase, fn, *fp=NULL;
161	char ln[512], rout[256], auth[256], cc[256], ccflags[256];	161	char ln[512], rout[256], auth[256], cc[256], ccflags[256];
		162	char temp[256];
162	char pcc, pccflags;	163	char pcc, pccflags;
163	int i, n, ID, alpha, beta, incX, incY;	164	int i, n, ID, alpha, beta, incX, incY;
164		165
Lines 180-186 Link Here
180	assert(fgets(ccflags, 512, fpin) != NULL);	181	assert(fgets(ccflags, 512, fpin) != NULL);
181	FixFlags(cc);	182	FixFlags(cc);
182	FixFlags(ccflags);	183	FixFlags(ccflags);
183	pcc = cc;	184	/* Gentoo pcc = cc; */
		185	strcpy(temp, "$(LIBTOOL) ");
		186	strcat(temp, cc);
		187	pcc = temp;
184	pccflags = ccflags;	188	pccflags = ccflags;
185	}	189	}
186	else pcc = pccflags = NULL;	190	else pcc = pccflags = NULL;

Lines 159-164 Link Here

(-)ATLAS/tune/blas/level1/iamaxsrch.c (-1 / +5 lines)
159	FILE *fpin;	159	FILE *fpin;
160	FILENODE fbase, fn, *fp=NULL;	160	FILENODE fbase, fn, *fp=NULL;
161	char ln[512], rout[256], auth[256], cc[256], ccflags[256];	161	char ln[512], rout[256], auth[256], cc[256], ccflags[256];
		162	char temp[256];
162	char pcc, pccflags;	163	char pcc, pccflags;
163	int i, n, ID, alpha, beta, incX, incY;	164	int i, n, ID, alpha, beta, incX, incY;
164		165
Lines 179-185 Link Here
179	assert(fgets(ccflags, 512, fpin) != NULL);	180	assert(fgets(ccflags, 512, fpin) != NULL);
180	FixFlags(cc);	181	FixFlags(cc);
181	FixFlags(ccflags);	182	FixFlags(ccflags);
182	pcc = cc;	183	/* Gentoo pcc = cc; */
		184	strcpy(temp, "$(LIBTOOL) ");
		185	strcat(temp, cc);
		186	pcc = temp;
183	pccflags = ccflags;	187	pccflags = ccflags;
184	}	188	}
185	else pcc = pccflags = NULL;	189	else pcc = pccflags = NULL;

Lines 159-164 Link Here

(-)ATLAS/tune/blas/level1/setsrch.c (-1 / +5 lines)
159	FILE *fpin;	159	FILE *fpin;
160	FILENODE fbase, fn, *fp=NULL;	160	FILENODE fbase, fn, *fp=NULL;
161	char ln[512], rout[256], auth[256], cc[256], ccflags[256];	161	char ln[512], rout[256], auth[256], cc[256], ccflags[256];
		162	char temp[256];
162	char pcc, pccflags;	163	char pcc, pccflags;
163	int i, n, ID, alpha, beta, incX, incY;	164	int i, n, ID, alpha, beta, incX, incY;
164		165
Lines 181-187 Link Here
181	assert(fgets(ccflags, 512, fpin) != NULL);	182	assert(fgets(ccflags, 512, fpin) != NULL);
182	FixFlags(cc);	183	FixFlags(cc);
183	FixFlags(ccflags);	184	FixFlags(ccflags);
184	pcc = cc;	185	/* Gentoo pcc = cc; */
		186	strcpy(temp, "$(LIBTOOL) ");
		187	strcat(temp, cc);
		188	pcc = temp;
185	pccflags = ccflags;	189	pccflags = ccflags;
186	}	190	}
187	else pcc = pccflags = NULL;	191	else pcc = pccflags = NULL;

Return to bug 30453

Lines 2140-2150 Link Here

(-)ATLAS/config.c (-2 / +23 lines)
2140	/*	2140	/*
2141	* If requested, see if we can locate a comparison BLAS	2141	* If requested, see if we can locate a comparison BLAS
2142	*/	2142	*/
		2143	/* Gentoo
2143	if (F77 && BLASlib)	2144	if (F77 && BLASlib)
2144	{	2145	{
2145	GetBlasTry(OS, mach, BLASlib);	2146	GetBlasTry(OS, mach, BLASlib);
2146	FindBlas(fpout, fplog, redir, F77, F77FLAGS, BLASlib);	2147	FindBlas(fpout, fplog, redir, F77, F77FLAGS, BLASlib);
2147	}	2148	}
		2149	*/
2148	/*	2150	/*
2149	* If using a non-g77 Fortran under Windows, throw the -mno-cygwin for all gcc	2151	* If using a non-g77 Fortran under Windows, throw the -mno-cygwin for all gcc
2150	*/	2152	*/
Lines 2931-2936 Link Here
2931	else if (strstr(ln, "Athlon(tm) 64")) mach = AmdHammer64;	2933	else if (strstr(ln, "Athlon(tm) 64")) mach = AmdHammer64;
2932	else if (strstr(ln, "Athlon")) mach = AmdAthlon;	2934	else if (strstr(ln, "Athlon")) mach = AmdAthlon;
2933	else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;	2935	else if (strstr(ln, "AMD-K7")) mach = AmdAthlon;
		2936	else if (strstr(ln, "XEON")) mach = IntP4; /* Gentoo */
2934	}	2937	}
2935	break;	2938	break;
2936	default:;	2939	default:;
Lines 3063-3068 Link Here
3063	if (i \|\| ln[0] == '\0' \|\| strstr(ln, "i586") \|\| strstr(ln, "i486") \|\|	3066	if (i \|\| ln[0] == '\0' \|\| strstr(ln, "i586") \|\| strstr(ln, "i486") \|\|
3064	strstr(ln, "i386"))	3067	strstr(ln, "i386"))
3065	{	3068	{
		3069	#ifndef INTERACTIVE
		3070	exit(-1); // Make ebuild complain. /
		3071	#endif
3066	fprintf(stdout, "Enter your machine type:\n");	3072	fprintf(stdout, "Enter your machine type:\n");
3067	fprintf(stdout, " 1. Other/UNKNOWN\n\n");	3073	fprintf(stdout, " 1. Other/UNKNOWN\n\n");
3068	fprintf(stdout, " 2. AMD Athlon\n");	3074	fprintf(stdout, " 2. AMD Athlon\n");
Lines 3080-3085 Link Here
3080	}	3086	}
3081	else if (strstr(ln, "ia64"))	3087	else if (strstr(ln, "ia64"))
3082	{	3088	{
		3089	#ifndef INTERACTIVE
		3090	exit(-1); // Make ebuild complain. /
		3091	#endif
3083	fprintf(stdout, "Enter your machine type:\n");	3092	fprintf(stdout, "Enter your machine type:\n");
3084	fprintf(stdout, " 1. Other/UNKNOWN\n");	3093	fprintf(stdout, " 1. Other/UNKNOWN\n");
3085	fprintf(stdout, " 2. IA-64 Itanium 1\n");	3094	fprintf(stdout, " 2. IA-64 Itanium 1\n");
Lines 3091-3096 Link Here
3091	}	3100	}
3092	else if (strstr(ln, "x86_64"))	3101	else if (strstr(ln, "x86_64"))
3093	{	3102	{
		3103	#ifndef INTERACTIVE
		3104	exit(-1); // Make ebuild complain. /
		3105	#endif
3094	fprintf(stdout, "Enter your machine type:\n");	3106	fprintf(stdout, "Enter your machine type:\n");
3095	fprintf(stdout, " 1. Other/UNKNOWN\n");	3107	fprintf(stdout, " 1. Other/UNKNOWN\n");
3096	fprintf(stdout, " 2. 32 bit AMD Hammer\n");	3108	fprintf(stdout, " 2. 32 bit AMD Hammer\n");
Lines 3102-3107 Link Here
3102	}	3114	}
3103	else if (strstr(ln, "i686"))	3115	else if (strstr(ln, "i686"))
3104	{	3116	{
		3117	#ifndef INTERACTIVE
		3118	exit(-1); /* Make ebuild complain. */
		3119	#endif
3105	fprintf(stdout, "Enter your machine type:\n");	3120	fprintf(stdout, "Enter your machine type:\n");
3106	fprintf(stdout, " 1. Other/UNKNOWN\n");	3121	fprintf(stdout, " 1. Other/UNKNOWN\n");
3107	fprintf(stdout, " 2. AMD Athlon\n");	3122	fprintf(stdout, " 2. AMD Athlon\n");
Lines 3655-3661 Link Here
3655	if (ierr)	3670	if (ierr)
3656	{	3671	{
3657	fprintf(stderr, "File Make.%s already exists!\n", ARCH);	3672	fprintf(stderr, "File Make.%s already exists!\n", ARCH);
3658	ierr = !IsYes('n', "", "overwrite it?");	3673	/* Gentoo ierr = !IsYes('n', "", "overwrite it?"); */
		3674	ierr = !IsYes('y', "", "overwrite it?");
3659	}	3675	}
3660	}	3676	}
3661	while (ierr);	3677	while (ierr);
Lines 3981-3987 Link Here
3981	fprintf(fpout, " MVTdir = $(TOPdir)/tune/blas/gemv/$(ARCH)\n");	3997	fprintf(fpout, " MVTdir = $(TOPdir)/tune/blas/gemv/$(ARCH)\n");
3982	fprintf(fpout, " R1Tdir = $(TOPdir)/tune/blas/ger/$(ARCH)\n");	3998	fprintf(fpout, " R1Tdir = $(TOPdir)/tune/blas/ger/$(ARCH)\n");
3983	fprintf(fpout, " L1Tdir = $(TOPdir)/tune/blas/level1/$(ARCH)\n");	3999	fprintf(fpout, " L1Tdir = $(TOPdir)/tune/blas/level1/$(ARCH)\n");
3984	fprintf(fpout, " L3Tdir = $(TOPdir)/tune/blas/level3/$(ARCH)\n\n");	4000	fprintf(fpout, " L3Tdir = $(TOPdir)/tune/blas/level3/$(ARCH)\n");
3985		4001
3986	fprintf(fpout,	4002	fprintf(fpout,
3987	"# ---------------------------------------------------------------------\n");	4003	"# ---------------------------------------------------------------------\n");
Lines 4128-4134 Link Here
4128	fprintf(fpout, " BC = $(CC)\n");	4144	fprintf(fpout, " BC = $(CC)\n");
4129	fprintf(fpout, " BCFLAGS = $(CCFLAGS)\n");	4145	fprintf(fpout, " BCFLAGS = $(CCFLAGS)\n");
4130	}	4146	}
		4147	#ifdef USE_LIBTOOL
		4148	fprintf(fpout, " LIBTOOL = libtool --mode=compile\n");
		4149	fprintf(fpout, " ARCHIVER = $(TOPdir)/war %s\n", ARCHIVER);
		4150	#else
4131	fprintf(fpout, " ARCHIVER = %s\n", ARCHIVER);	4151	fprintf(fpout, " ARCHIVER = %s\n", ARCHIVER);
		4152	#endif
4132	fprintf(fpout, " ARFLAGS = %s\n", ARFLAGS);	4153	fprintf(fpout, " ARFLAGS = %s\n", ARFLAGS);
4133	fprintf(fpout, " RANLIB = %s\n\n", RANLIB);	4154	fprintf(fpout, " RANLIB = %s\n\n", RANLIB);
4134		4155

Lines 102-113 Link Here

(-)ATLAS/makes/Make.sysinfo (-2 / +2 lines)
102	ATL_cputime.c :	102	ATL_cputime.c :
103	cp ../ATL_cputime.c .	103	cp ../ATL_cputime.c .
104	ATL_cputime.o : ATL_cputime.c	104	ATL_cputime.o : ATL_cputime.c
105	$(CC) -c $(CCFLAGS) ATL_cputime.c	105	$(LIBTOOL) $(CC) -c $(CCFLAGS) ATL_cputime.c
106		106
107	ATL_walltime.c :	107	ATL_walltime.c :
108	cp ../ATL_walltime.c .	108	cp ../ATL_walltime.c .
109	ATL_walltime.o : ATL_walltime.c	109	ATL_walltime.o : ATL_walltime.c
110	$(CC) -c $(CCFLAGS) ATL_walltime.c	110	$(LIBTOOL) $(CC) -c $(CCFLAGS) ATL_walltime.c
111		111
112	ATL_Xwalltime.o : ATL_walltime.o	112	ATL_Xwalltime.o : ATL_walltime.o
113	$(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c	113	$(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c

Lines 505-512 Link Here

(-)ATLAS/tune/blas/gemv/mvsearch.c (-5 / +5 lines)
505	assert(fp);	505	assert(fp);
506	fprintf(fp, "include Make.inc\n\n");	506	fprintf(fp, "include Make.inc\n\n");
507		507
508	if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(CC)\n");	508	if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(LIBTOOL) $(CC)\n");
509	else fprintf(fp, "MVNCC = %s\n", ccN);	509	else fprintf(fp, "MVNCC = $(LIBTOOL) %s\n", ccN);
510	if (ccN[0] == '\0' && ccflagsN[0] != '\0')	510	if (ccN[0] == '\0' && ccflagsN[0] != '\0')
511	fprintf(fp, "MVNFLAGS = $(CCFLAGS) %s -D%s\n", ccflagsN, typ);	511	fprintf(fp, "MVNFLAGS = $(CCFLAGS) %s -D%s\n", ccflagsN, typ);
512	else if (ccflagsN[0] != '\0')	512	else if (ccflagsN[0] != '\0')
Lines 518-525 Link Here
518	fprintf(fp, "MVNcFLAGS = $(MVNFLAGS) -DConj_\n\n");	518	fprintf(fp, "MVNcFLAGS = $(MVNFLAGS) -DConj_\n\n");
519	}	519	}
520		520
521	if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(CC)\n");	521	if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(LIBTOOL) $(CC)\n");
522	else fprintf(fp, "MVTCC = %s\n", ccT);	522	else fprintf(fp, "MVTCC = $(LIBTOOL) %s\n", ccT);
523	if (ccT[0] == '\0' && ccflagsT[0] != '\0')	523	if (ccT[0] == '\0' && ccflagsT[0] != '\0')
524	fprintf(fp, "MVTFLAGS = $(CCFLAGS) %s -D%s\n", ccflagsT, typ);	524	fprintf(fp, "MVTFLAGS = $(CCFLAGS) %s -D%s\n", ccflagsT, typ);
525	else if (ccflagsT[0] != '\0')	525	else if (ccflagsT[0] != '\0')
Lines 532-538 Link Here
532	}	532	}
533		533
534	if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(CC)\n");	534	if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(CC)\n");
535	else fprintf(fp, "MVSCC = %s\n", ccS);	535	else fprintf(fp, "MVSCC = $(LIBTOOL) %s\n", ccS);
536	if (ccS[0] == '\0' && ccflagsS[0] != '\0')	536	if (ccS[0] == '\0' && ccflagsS[0] != '\0')
537	fprintf(fp, "MVSFLAGS = $(CCFLAGS) %s -D%s", ccflagsS, typ);	537	fprintf(fp, "MVSFLAGS = $(CCFLAGS) %s -D%s", ccflagsS, typ);
538	else if (ccflagsS[0] != '\0')	538	else if (ccflagsS[0] != '\0')

Lines 16-21 Link Here

(-)ATLAS/Make.top (+65 lines)
16	install:	16	install:
17	cd bin/$(arch) ; $(MAKE) xatlas_install	17	cd bin/$(arch) ; $(MAKE) xatlas_install
18	cd bin/$(arch) ; ./xatlas_install -d $(ARCHDEF) $(MMDEF) $(INSTFLAGS)	18	cd bin/$(arch) ; ./xatlas_install -d $(ARCHDEF) $(MMDEF) $(INSTFLAGS)
		19
		20	shared: INSTALLER = cp
		21	shared: RPATH = /usr/lib/blas/atlas
		22	shared: libatlas.so libblas.so libcblas.so
		23
		24	shared-strip: INSTALLER = install -s
		25	shared-strip: RPATH = /usr/lib/blas/atlas
		26	shared-strip: libatlas.so libblas.so libcblas.so
		27
		28	ptshared: INSTALLER = cp
		29	ptshared: RPATH = /usr/lib/blas/threaded-atlas
		30	ptshared: libptblas.so libptcblas.so
		31
		32	ptshared-strip: INSTALLER = install -s
		33	ptshared-strip: RPATH = /usr/lib/blas/threaded-atlas
		34	ptshared-strip: libptblas.so libptcblas.so
		35
		36	liblapack.so: RPATH = /usr/lib/lapack/atlas
		37
		38	libatlas.so:
		39	mkdir -p gentoo/libs
		40	cd gentoo/libatlas.a ; \
		41	libtool --mode=link $(CC) -o libatlas.la *.lo -rpath /usr/lib ; \
		42	libtool $(INSTALLER) libatlas.la $(TOPdir)/gentoo/libs
		43
		44	# libg2c is part of GNU gcc. It is listed here as a dependency for the F77
		45	# BLAS libraries in case the user wants to link with the libraries using
		46	# the Intel Fortran Compiler. The issue is with xerbla.f, which calls the
		47	# STOP instrinsic. Linking with ifc will result in undefined symbols like
		48	# e_wsfe and others. These symbols are contained in libg2c. If you will not
		49	# use ifc, you most likely want to remove the '-lg2c' from libblas.so
		50	# and possibly libptblas.so. Of course, you can just remove -lg2c, and
		51	# specify it explicitly when using ifc.
		52	libblas.so:
		53	cd gentoo/libf77blas.a ; \
		54	libtool --mode=link $(CC) -o libblas.la ../libs/libatlas.la *.lo \
		55	-rpath $(RPATH) -lg2c ; \
		56	libtool $(INSTALLER) libblas.la $(TOPdir)/gentoo/libs
		57
		58	libcblas.so:
		59	cd gentoo/libcblas.a ; \
		60	libtool --mode=link $(CC) -o libcblas.la ../libs/libatlas.la *.lo \
		61	-rpath $(RPATH) ; \
		62	libtool $(INSTALLER) libcblas.la $(TOPdir)/gentoo/libs
		63
		64	libptblas.so:
		65	mkdir -p gentoo/threaded-libs
		66	cd gentoo/libptf77blas.a ; \
		67	libtool --mode=link $(CC) -o libblas.la ../libs/libatlas.la *.lo \
		68	-rpath $(RPATH) -lg2c -lpthread ; \
		69	libtool $(INSTALLER) libblas.la $(TOPdir)/gentoo/threaded-libs
		70
		71	libptcblas.so:
		72	cd gentoo/libptcblas.a ; \
		73	libtool --mode=link $(CC) -o libcblas.la ../libs/libatlas.la *.lo \
		74	-rpath $(RPATH) -lpthread ; \
		75	libtool $(INSTALLER) libcblas.la $(TOPdir)/gentoo/threaded-libs
		76
		77	liblapack.so:
		78	mkdir -p gentoo/libs
		79	cd gentoo/liblapack.a ; \
		80	libtool --mode=link $(CC) -o liblapack.la *.lo \
		81	-rpath $(RPATH) -lblas -lcblas -latlas -lg2c; \
		82	libtool $(INSTALLER) liblapack.la $(TOPdir)/gentoo/libs
83
19	sanity_test :	84	sanity_test :
20	@ echo "BUILDING TESTERS:"	85	@ echo "BUILDING TESTERS:"
21	cd bin/$(arch) ; $(MAKE) sanity_test	86	cd bin/$(arch) ; $(MAKE) sanity_test

Lines 25-30 Link Here

(-)ATLAS/Makefile (+15 lines)
25	install :	25	install :
26	$(MAKE) -f Make.top install arch=$(arch)	26	$(MAKE) -f Make.top install arch=$(arch)
27		27
		28	shared :
		29	$(MAKE) -f Make.top shared arch=$(arch)
		30
		31	shared-strip :
		32	$(MAKE) -f Make.top shared-strip arch=$(arch)
		33
		34	ptshared :
		35	$(MAKE) -f Make.top ptshared arch=$(arch)
		36
		37	ptshared-strip :
		38	$(MAKE) -f Make.top ptshared-strip arch=$(arch)
		39
		40	liblapack.so :
		41	$(MAKE) -f Make.top liblapack.so arch=$(arch)
		42
28	dup0 :	43	dup0 :
29	$(MAKE) -f Make.top dup0 arch=$(arch) arch0=$(arch0)	44	$(MAKE) -f Make.top dup0 arch=$(arch) arch0=$(arch0)
30	dup :	45	dup :

Lines 1-4 Link Here

(-)ATLAS/makes/Make.aux (+3 lines)
1	include Make.inc	1	include Make.inc
		2	CC:=$(LIBTOOL) $(CC)
2		3
3	ptobj = ATL_ptflushcache.o	4	ptobj = ATL_ptflushcache.o
4	obj = ATL_flushcache.o ATL_cputime.o ATL_walltime.o ATL_xerbla.o ATL_lcm.o \	5	obj = ATL_flushcache.o ATL_cputime.o ATL_walltime.o ATL_xerbla.o ATL_lcm.o \
Lines 112-123 Link Here
112		113
113	ATL_cputime.o : $(SYSdir)/ATL_cputime.o	114	ATL_cputime.o : $(SYSdir)/ATL_cputime.o
114	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o	115	cp $(SYSdir)/ATL_cputime.o ATL_cputime.o
		116	ln -sf $(SYSdir)/ATL_cputime.lo ATL_cputime.lo
115	$(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c	117	$(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c
116	cd $(SYSdir) ; $(MAKE) ATL_cputime.o	118	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
117	$(SYSdir)/ATL_cputime.c:	119	$(SYSdir)/ATL_cputime.c:
118	cd $(SYSdir) ; $(MAKE) ATL_cputime.o	120	cd $(SYSdir) ; $(MAKE) ATL_cputime.o
119	ATL_walltime.o : $(SYSdir)/ATL_walltime.o	121	ATL_walltime.o : $(SYSdir)/ATL_walltime.o
120	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o	122	cp $(SYSdir)/ATL_walltime.o ATL_walltime.o
		123	ln -sf $(SYSdir)/ATL_walltime.lo ATL_walltime.lo
121	$(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c	124	$(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c
122	cd $(SYSdir) ; $(MAKE) ATL_walltime.o	125	cd $(SYSdir) ; $(MAKE) ATL_walltime.o
123	$(SYSdir)/ATL_walltime.c:	126	$(SYSdir)/ATL_walltime.c:

Lines 1-4 Link Here

(-)ATLAS/makes/Make.l1src (-50 / +51 lines)
1	include Make.inc	1	include Make.inc
		2	CC:=$(LIBTOOL) $(CC)
2		3
3	sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o	4	sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o
4		5
Lines 16-44 Link Here
16		17
17	sgen :	18	sgen :
18	$(MAKE) Make_srot	19	$(MAKE) Make_srot
19	$(MAKE) -f Make_srot lib	20	$(MAKE) -f Make_srot lib CC="$(CC)"
20	$(MAKE) Make_saxpby	21	$(MAKE) Make_saxpby
21	$(MAKE) -f Make_saxpby lib	22	$(MAKE) -f Make_saxpby lib CC="$(CC)"
22	$(MAKE) Make_scpsc	23	$(MAKE) Make_scpsc
23	$(MAKE) -f Make_scpsc lib	24	$(MAKE) -f Make_scpsc lib CC="$(CC)"
24	$(MAKE) Make_sset	25	$(MAKE) Make_sset
25	$(MAKE) -f Make_sset lib	26	$(MAKE) -f Make_sset lib CC="$(CC)"
26	$(MAKE) Make_snrm2	27	$(MAKE) Make_snrm2
27	$(MAKE) -f Make_snrm2 lib	28	$(MAKE) -f Make_snrm2 lib CC="$(CC)"
28	$(MAKE) Make_sasum	29	$(MAKE) Make_sasum
29	$(MAKE) -f Make_sasum lib	30	$(MAKE) -f Make_sasum lib CC="$(CC)"
30	$(MAKE) Make_sdot	31	$(MAKE) Make_sdot
31	$(MAKE) -f Make_sdot lib	32	$(MAKE) -f Make_sdot lib CC="$(CC)"
32	$(MAKE) Make_sswap	33	$(MAKE) Make_sswap
33	$(MAKE) -f Make_sswap lib	34	$(MAKE) -f Make_sswap lib CC="$(CC)"
34	$(MAKE) Make_sscal	35	$(MAKE) Make_sscal
35	$(MAKE) -f Make_sscal lib	36	$(MAKE) -f Make_sscal lib CC="$(CC)"
36	$(MAKE) Make_scopy	37	$(MAKE) Make_scopy
37	$(MAKE) -f Make_scopy lib	38	$(MAKE) -f Make_scopy lib CC="$(CC)"
38	$(MAKE) Make_saxpy	39	$(MAKE) Make_saxpy
39	$(MAKE) -f Make_saxpy lib	40	$(MAKE) -f Make_saxpy lib CC="$(CC)"
40	$(MAKE) Make_siamax	41	$(MAKE) Make_siamax
41	$(MAKE) -f Make_siamax lib	42	$(MAKE) -f Make_siamax lib CC="$(CC)"
42	slvl1 : slib	43	slvl1 : slib
43	slib : slib.grd	44	slib : slib.grd
44	$(MAKE) sgen	45	$(MAKE) sgen
Lines 51-79 Link Here
51	rm -f $(sobj) s*.grd	52	rm -f $(sobj) s*.grd
52	dgen :	53	dgen :
53	$(MAKE) Make_drot	54	$(MAKE) Make_drot
54	$(MAKE) -f Make_drot lib	55	$(MAKE) -f Make_drot lib CC="$(CC)"
55	$(MAKE) Make_daxpby	56	$(MAKE) Make_daxpby
56	$(MAKE) -f Make_daxpby lib	57	$(MAKE) -f Make_daxpby lib CC="$(CC)"
57	$(MAKE) Make_dcpsc	58	$(MAKE) Make_dcpsc
58	$(MAKE) -f Make_dcpsc lib	59	$(MAKE) -f Make_dcpsc lib CC="$(CC)"
59	$(MAKE) Make_dset	60	$(MAKE) Make_dset
60	$(MAKE) -f Make_dset lib	61	$(MAKE) -f Make_dset lib CC="$(CC)"
61	$(MAKE) Make_dnrm2	62	$(MAKE) Make_dnrm2
62	$(MAKE) -f Make_dnrm2 lib	63	$(MAKE) -f Make_dnrm2 lib CC="$(CC)"
63	$(MAKE) Make_dasum	64	$(MAKE) Make_dasum
64	$(MAKE) -f Make_dasum lib	65	$(MAKE) -f Make_dasum lib CC="$(CC)"
65	$(MAKE) Make_ddot	66	$(MAKE) Make_ddot
66	$(MAKE) -f Make_ddot lib	67	$(MAKE) -f Make_ddot lib CC="$(CC)"
67	$(MAKE) Make_dswap	68	$(MAKE) Make_dswap
68	$(MAKE) -f Make_dswap lib	69	$(MAKE) -f Make_dswap lib CC="$(CC)"
69	$(MAKE) Make_dscal	70	$(MAKE) Make_dscal
70	$(MAKE) -f Make_dscal lib	71	$(MAKE) -f Make_dscal lib CC="$(CC)"
71	$(MAKE) Make_dcopy	72	$(MAKE) Make_dcopy
72	$(MAKE) -f Make_dcopy lib	73	$(MAKE) -f Make_dcopy lib CC="$(CC)"
73	$(MAKE) Make_daxpy	74	$(MAKE) Make_daxpy
74	$(MAKE) -f Make_daxpy lib	75	$(MAKE) -f Make_daxpy lib CC="$(CC)"
75	$(MAKE) Make_diamax	76	$(MAKE) Make_diamax
76	$(MAKE) -f Make_diamax lib	77	$(MAKE) -f Make_diamax lib CC="$(CC)"
77	dlvl1 : dlib	78	dlvl1 : dlib
78	dlib : dlib.grd	79	dlib : dlib.grd
79	$(MAKE) dgen	80	$(MAKE) dgen
Lines 86-116 Link Here
86	rm -f $(dobj) d*.grd	87	rm -f $(dobj) d*.grd
87	cgen :	88	cgen :
88	$(MAKE) Make_crot	89	$(MAKE) Make_crot
89	$(MAKE) -f Make_crot lib	90	$(MAKE) -f Make_crot lib CC="$(CC)"
90	$(MAKE) Make_caxpby	91	$(MAKE) Make_caxpby
91	$(MAKE) -f Make_caxpby lib	92	$(MAKE) -f Make_caxpby lib CC="$(CC)"
92	$(MAKE) Make_ccpsc	93	$(MAKE) Make_ccpsc
93	$(MAKE) -f Make_ccpsc lib	94	$(MAKE) -f Make_ccpsc lib CC="$(CC)"
94	$(MAKE) Make_cset	95	$(MAKE) Make_cset
95	$(MAKE) -f Make_cset lib	96	$(MAKE) -f Make_cset lib CC="$(CC)"
96	$(MAKE) Make_cnrm2	97	$(MAKE) Make_cnrm2
97	$(MAKE) -f Make_cnrm2 lib	98	$(MAKE) -f Make_cnrm2 lib CC="$(CC)"
98	$(MAKE) Make_casum	99	$(MAKE) Make_casum
99	$(MAKE) -f Make_casum lib	100	$(MAKE) -f Make_casum lib CC="$(CC)"
100	$(MAKE) Make_cdot	101	$(MAKE) Make_cdot
101	$(MAKE) -f Make_cdot lib	102	$(MAKE) -f Make_cdot lib CC="$(CC)"
102	$(MAKE) Make_cswap	103	$(MAKE) Make_cswap
103	$(MAKE) -f Make_cswap lib	104	$(MAKE) -f Make_cswap lib CC="$(CC)"
104	$(MAKE) Make_cscal	105	$(MAKE) Make_cscal
105	$(MAKE) -f Make_cscal lib	106	$(MAKE) -f Make_cscal lib CC="$(CC)"
106	$(MAKE) Make_ccopy	107	$(MAKE) Make_ccopy
107	$(MAKE) -f Make_ccopy lib	108	$(MAKE) -f Make_ccopy lib CC="$(CC)"
108	$(MAKE) Make_caxpy	109	$(MAKE) Make_caxpy
109	$(MAKE) -f Make_caxpy lib	110	$(MAKE) -f Make_caxpy lib CC="$(CC)"
110	$(MAKE) Make_ciamax	111	$(MAKE) Make_ciamax
111	$(MAKE) -f Make_ciamax lib	112	$(MAKE) -f Make_ciamax lib CC="$(CC)"
112	$(MAKE) Make_cdotc	113	$(MAKE) Make_cdotc
113	$(MAKE) -f Make_cdotc lib	114	$(MAKE) -f Make_cdotc lib CC="$(CC)"
114	clvl1 : clib	115	clvl1 : clib
115	clib : slib clib.grd	116	clib : slib clib.grd
116	$(MAKE) cgen	117	$(MAKE) cgen
Lines 123-153 Link Here
123	rm -f $(cobj) c*.grd	124	rm -f $(cobj) c*.grd
124	zgen :	125	zgen :
125	$(MAKE) Make_zrot	126	$(MAKE) Make_zrot
126	$(MAKE) -f Make_zrot lib	127	$(MAKE) -f Make_zrot lib CC="$(CC)"
127	$(MAKE) Make_zaxpby	128	$(MAKE) Make_zaxpby
128	$(MAKE) -f Make_zaxpby lib	129	$(MAKE) -f Make_zaxpby lib CC="$(CC)"
129	$(MAKE) Make_zcpsc	130	$(MAKE) Make_zcpsc
130	$(MAKE) -f Make_zcpsc lib	131	$(MAKE) -f Make_zcpsc lib CC="$(CC)"
131	$(MAKE) Make_zset	132	$(MAKE) Make_zset
132	$(MAKE) -f Make_zset lib	133	$(MAKE) -f Make_zset lib CC="$(CC)"
133	$(MAKE) Make_znrm2	134	$(MAKE) Make_znrm2
134	$(MAKE) -f Make_znrm2 lib	135	$(MAKE) -f Make_znrm2 lib CC="$(CC)"
135	$(MAKE) Make_zasum	136	$(MAKE) Make_zasum
136	$(MAKE) -f Make_zasum lib	137	$(MAKE) -f Make_zasum lib CC="$(CC)"
137	$(MAKE) Make_zdot	138	$(MAKE) Make_zdot
138	$(MAKE) -f Make_zdot lib	139	$(MAKE) -f Make_zdot lib CC="$(CC)"
139	$(MAKE) Make_zswap	140	$(MAKE) Make_zswap
140	$(MAKE) -f Make_zswap lib	141	$(MAKE) -f Make_zswap lib CC="$(CC)"
141	$(MAKE) Make_zscal	142	$(MAKE) Make_zscal
142	$(MAKE) -f Make_zscal lib	143	$(MAKE) -f Make_zscal lib CC="$(CC)"
143	$(MAKE) Make_zcopy	144	$(MAKE) Make_zcopy
144	$(MAKE) -f Make_zcopy lib	145	$(MAKE) -f Make_zcopy lib CC="$(CC)"
145	$(MAKE) Make_zaxpy	146	$(MAKE) Make_zaxpy
146	$(MAKE) -f Make_zaxpy lib	147	$(MAKE) -f Make_zaxpy lib CC="$(CC)"
147	$(MAKE) Make_ziamax	148	$(MAKE) Make_ziamax
148	$(MAKE) -f Make_ziamax lib	149	$(MAKE) -f Make_ziamax lib CC="$(CC)"
149	$(MAKE) Make_zdotc	150	$(MAKE) Make_zdotc
150	$(MAKE) -f Make_zdotc lib	151	$(MAKE) -f Make_zdotc lib CC="$(CC)"
151	zlvl1 : zlib	152	zlvl1 : zlib
152	zlib : dlib zlib.grd	153	zlib : dlib zlib.grd
153	$(MAKE) zgen	154	$(MAKE) zgen

Lines 1-4 Link Here

(-)ATLAS/makes/Make.mvsrc (-4 / +5 lines)
1	include Make.inc	1	include Make.inc
		2	CC:=$(LIBTOOL) $(CC)
2		3
3	sobj = ATL_sgemv.o	4	sobj = ATL_sgemv.o
4		5
Lines 18-24 Link Here
18	clean : sclean dclean cclean zclean	19	clean : sclean dclean cclean zclean
19		20
20	dlib :	21	dlib :
21	$(PMAKE) -f Make_dmv dlib	22	$(PMAKE) -f Make_dmv dlib CC="$(CC)"
22	$(PMAKE) dlib.grd	23	$(PMAKE) dlib.grd
23	dlib.grd : $(dobj)	24	dlib.grd : $(dobj)
24	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)	25	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
Lines 27-33 Link Here
27	dclean :	28	dclean :
28	rm -f $(dobj) d*.grd	29	rm -f $(dobj) d*.grd
29	slib :	30	slib :
30	$(PMAKE) -f Make_smv slib	31	$(PMAKE) -f Make_smv slib CC="$(CC)"
31	$(PMAKE) slib.grd	32	$(PMAKE) slib.grd
32	slib.grd : $(sobj)	33	slib.grd : $(sobj)
33	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)	34	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
Lines 36-42 Link Here
36	sclean :	37	sclean :
37	rm -f $(sobj) s*.grd	38	rm -f $(sobj) s*.grd
38	clib :	39	clib :
39	$(PMAKE) -f Make_cmv clib	40	$(PMAKE) -f Make_cmv clib CC="$(CC)"
40	$(PMAKE) clib.grd	41	$(PMAKE) clib.grd
41	clib.grd : $(cobj)	42	clib.grd : $(cobj)
42	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)	43	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
Lines 45-51 Link Here
45	cclean :	46	cclean :
46	rm -f $(cobj) c*.grd	47	rm -f $(cobj) c*.grd
47	zlib :	48	zlib :
48	$(PMAKE) -f Make_zmv zlib	49	$(PMAKE) -f Make_zmv zlib CC="$(CC)"
49	$(PMAKE) zlib.grd	50	$(PMAKE) zlib.grd
50	zlib.grd : $(zobj)	51	zlib.grd : $(zobj)
51	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)	52	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)

Lines 1-4 Link Here

(-)ATLAS/makes/Make.r1src (-4 / +5 lines)
1	include Make.inc	1	include Make.inc
		2	CC:=$(LIBTOOL) $(CC)
2		3
3	sobj = ATL_sger.o	4	sobj = ATL_sger.o
4	dobj = ATL_dger.o	5	dobj = ATL_dger.o
Lines 16-22 Link Here
16		17
17	dlib :	18	dlib :
18	$(PMAKE) dlib.grd	19	$(PMAKE) dlib.grd
19	$(PMAKE) -f Make_dr1 lib	20	$(PMAKE) -f Make_dr1 lib CC="$(CC)"
20	dlib.grd : $(dobj)	21	dlib.grd : $(dobj)
21	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)	22	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj)
22	$(RANLIB) $(ATLASlib)	23	$(RANLIB) $(ATLASlib)
Lines 25-31 Link Here
25	rm -f $(dobj) d*.grd	26	rm -f $(dobj) d*.grd
26	slib :	27	slib :
27	$(PMAKE) slib.grd	28	$(PMAKE) slib.grd
28	$(PMAKE) -f Make_sr1 lib	29	$(PMAKE) -f Make_sr1 lib CC="$(CC)"
29	slib.grd : $(sobj)	30	slib.grd : $(sobj)
30	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)	31	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj)
31	$(RANLIB) $(ATLASlib)	32	$(RANLIB) $(ATLASlib)
Lines 34-40 Link Here
34	rm -f $(sobj) s*.grd	35	rm -f $(sobj) s*.grd
35	clib :	36	clib :
36	$(PMAKE) clib.grd	37	$(PMAKE) clib.grd
37	$(PMAKE) -f Make_cr1 lib	38	$(PMAKE) -f Make_cr1 lib CC="$(CC)"
38	clib.grd : $(cobj)	39	clib.grd : $(cobj)
39	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)	40	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj)
40	$(RANLIB) $(ATLASlib)	41	$(RANLIB) $(ATLASlib)
Lines 43-49 Link Here
43	rm -f $(cobj) c*.grd	44	rm -f $(cobj) c*.grd
44	zlib :	45	zlib :
45	$(PMAKE) zlib.grd	46	$(PMAKE) zlib.grd
46	$(PMAKE) -f Make_zr1 lib	47	$(PMAKE) -f Make_zr1 lib CC="$(CC)"
47	zlib.grd : $(zobj)	48	zlib.grd : $(zobj)
48	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)	49	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj)
49	$(RANLIB) $(ATLASlib)	50	$(RANLIB) $(ATLASlib)