version 1.4, 2008/01/23 20:58:53
|
version 1.5, 2008/02/08 00:52:43
|
Line 56 FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_p |
|
Line 56 FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_p |
|
| |
ifeq ($(COMPILER), icc) | ifeq ($(COMPILER), icc) |
ifeq ($(JSOC_MACHINE), linux_x86_64) | ifeq ($(JSOC_MACHINE), linux_x86_64) |
# FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/linux-x86_64/ -lfftw3f -lcfitsio |
# FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio |
# Path to 64-bit 3rd-party libraries | # Path to 64-bit 3rd-party libraries |
FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/linux_x86_64/ |
FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/ |
| |
# All 3rd-party math libraries - local rules can define a subset | # All 3rd-party math libraries - local rules can define a subset |
FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio | FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio |
else | else |
# FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/linux-ia32/ -lfftw3f -lcfitsio |
# FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio |
# Path to 32-bit 3rd-party libraries | # Path to 32-bit 3rd-party libraries |
FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/linux_ia32/ |
FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/ |
| |
# All 3rd-party math libraries - local rules can define a subset | # All 3rd-party math libraries - local rules can define a subset |
FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio | FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio |