# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1397871654 18000
# Fri Apr 18 20:40:54 2014 -0500
# Node ID d903f416ef63711865f0b8325cd5bb06132af03e
# Parent 0e344bcb0edfc864c73ef9072be1698768a94c55
make: use frameworks for lapack
diff --git a/admin/Makefile.build b/admin/Makefile.build
a
|
b
|
endif |
353 | 353 | ########################################################################### |
354 | 354 | # The following targets are there to avoid make error (target search) when |
355 | 355 | # only the shared libraries are installed (i.e. the corresponding archive |
356 | 356 | # libraries are missing). |
357 | 357 | |
358 | | -lblas: |
| 358 | -framework: |
359 | 359 | |
360 | | -llapack: |
| 360 | Accelerate: |
361 | 361 | |
362 | 362 | -lslatec: |
363 | 363 | |
364 | 364 | -lX11: |
365 | 365 | |
diff --git a/admin/Makefile.def b/admin/Makefile.def
a
|
b
|
endif |
536 | 536 | STDCpp_LIB += @STDCXXLIB@ |
537 | 537 | |
538 | 538 | ########################################################################### |
539 | 539 | # Kernel libraries |
540 | 540 | |
541 | | LEGACY_LIBS = -lslatec -llapack -lblas |
| 541 | LEGACY_LIBS = -lslatec -framework Accelerate |
542 | 542 | _GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc |
543 | 543 | ifndef GAG_WIN32 |
544 | 544 | GAG_LIBS = $(_GAG_LIBS) |
545 | 545 | else |
546 | 546 | GAG_LIBS = -lgkernel |
diff --git a/legacy/slatec/Makefile b/legacy/slatec/Makefile
a
|
b
|
M-all.o N-all.o O-all.o Q-all.o R-all.o |
22 | 22 | Sd-slatec.o Se-slatec.o Sg-slatec.o Si-slatec.o Sln-slatec.o So-slatec.o \ |
23 | 23 | Sp-slatec.o Sqr-slatec.o Ss-slatec.o St-slatec.o Suz-slatec.o T-all.o \ |
24 | 24 | U-all.o V-all.o W-all.o X-all.o Y-all.o Z-all.o d1mach.o i1mach.o pimach.o \ |
25 | 25 | r1mach.o dummy.o P-all.o P-value.o Dp-1vlu.o |
26 | 26 | |
27 | | LIB_DEPENDS = -llapack -lblas |
| 27 | LIB_DEPENDS = -framework Accelerate |
28 | 28 | |
29 | 29 | ifeq ($(GAG_COMPILER_KIND),ifc) |
30 | 30 | OPTION_FFLAGS = |
31 | 31 | endif |
32 | 32 | ifeq ($(GAG_COMPILER_KIND),ifort) |
diff --git a/packages/clic/lib/Makefile b/packages/clic/lib/Makefile
a
|
b
|
CLIC_LIB_OBJECTS = blockdata.o check.o c |
62 | 62 | sg_line_table.o table_passband.o clic_index.o |
63 | 63 | |
64 | 64 | # Mathematical library dependency |
65 | 65 | ifeq ($(LINEAR),lapack) |
66 | 66 | LINEAR_LIB_OBJECTS = singular.o mth_lapack.o |
67 | | LINEAR_LIB_DEPENDS = -llapack -lblas |
| 67 | LINEAR_LIB_DEPENDS = -framework Accelerate |
68 | 68 | else |
69 | 69 | ifeq ($(LINEAR),nag) |
70 | 70 | LINEAR_LIB_OBJECTS = mth_nag.o |
71 | 71 | LINEAR_LIB_DEPENDS = -lnag |
72 | 72 | else |