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.13 and 1.19

version 1.13, 2008/03/12 14:45:40

version 1.19, 2008/05/06 15:22:12

Line 55 endif

# Path to 3rd-party library headers

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

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

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

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/

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

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

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

FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio

endif

CFITSIOLIBS = $(CFITSIOL) -lcfitsio

ifeq ($(JSOC_MACHINE), linux_ia32)

else

# 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/

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

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

endif

ifeq ($(JSOC_MACHINE), mac_osx)

# 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/mac_osx/

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

GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/

ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/

endif

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

FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio

CFITSIOLIBS = $(CFITSIOL) -lcfitsio

endif

GSLLIBS = $(GSLL) -lgsl -lgslcblas

### Build flags for all targets

Line 155 ICC_CMPLR = $(SRCDIR)/build/ccd-icc

Line 166 ICC_CMPLR = $(SRCDIR)/build/ccd-icc

ARCHIVE = ar crus $@ $^

ECPG = ecpg -o $@ -c $<

SWIG = swig -perl5 -o $@ $<

GCC_COMP = $(GCC_CMPLR) $(GCC_CF_ALL) $(CF_TGT) -o $@ -c $<

ICC_COMP = $(ICC_CMPLR) $(ICC_CF_ALL) $(CF_TGT) -o $@ -c $<

Line 193 ifneq ($(COMPILER), icc)

Line 205 ifneq ($(COMPILER), icc)

else

SYSLIBS = -lz -ldl -lpthread

endif

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

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

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

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

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

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

Legend:

Removed from v.1.13
changed lines
	Added in v.1.19

Karen Tian