JSOC/make_basic.mk - diff

Return to make_basic.mk CVS log

Up to [Development] / JSOC

Diff for /JSOC/make_basic.mk between version 1.5 and 1.6

version 1.5, 2008/02/08 00:52:43

version 1.6, 2008/02/29 23:30:21

Line 52 endif

# Path to 3rd-party library headers

FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include

CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include

ifeq ($(COMPILER), icc)

ifeq ($(JSOC_MACHINE), linux_x86_64)

# FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio

# Path to 64-bit 3rd-party libraries

FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/

CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/

# All 3rd-party math libraries - local rules can define a subset

FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio

Line 66 ifeq ($(COMPILER), icc)

Line 67 ifeq ($(COMPILER), icc)

# FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio

# Path to 32-bit 3rd-party libraries

FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/

CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/

# All 3rd-party math libraries - local rules can define a subset

FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio

Line 166 FLINK = $(F77) $(F_LF_ALL) $(LF_TGT) -o

Line 168 FLINK = $(F77) $(F_LF_ALL) $(LF_TGT) -o

SLBIN = ln -sf ../../_$(JSOC_MACHINE)/$@ ../bin/$(JSOC_MACHINE)/

SLLIB = ln -sf ../../_$(JSOC_MACHINE)/$@ ../lib/$(JSOC_MACHINE)/

ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDSTRUCT_FPIC) $(LIBMISC_FPIC) $(LIBTIMEIO_FPIC)

ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDSTRUCT_FPIC) $(LIBMISC_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)

### Standard parts

Line 174 include $(SRCDIR)/Rules.mk

Line 176 include $(SRCDIR)/Rules.mk

# Libraries from src/util linked with all programs.

SYSLIBS = -lz -ldl -lpthread -lm

SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO)

SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW)

FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO)

FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW)

########## Libraries to link for server executables, ##############

########## standalone executables and pipeline modules. ##############

Legend:

Removed from v.1.5
changed lines
	Added in v.1.6

Karen Tian