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.65 and 1.68

version 1.65, 2010/08/29 04:43:24

version 1.68, 2011/01/12 02:04:59

Line 183 endif

LL_ALL = $(SYSLIBS)

GCC_LF_ALL = $(STATIC)

ICC_LF_ALL = $(STATIC) -openmp -static-intel

ICC_LF_ALL = $(STATIC) -openmp -static-intel -Wl,-export-dynamic

# Fortran global LINK flags

F_LF_ALL = -nofor_main -openmp -static-intel

F_LF_ALL = -nofor-main -openmp -static-intel

#***********************************************************************************************#

Line 302 ifneq ($(COMPILER), icc)

else

SYSLIBS = -lz -ldl -lpthread

endif

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

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

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

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

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

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

Legend:

Removed from v.1.65
changed lines
	Added in v.1.68

Karen Tian