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.20 and 1.21

version 1.20, 2008/05/20 17:19:20

version 1.21, 2008/06/23 18:43:00

Line 55 endif

# Path to 3rd-party library headers

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

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

#CFITSIOH = -I/home/kehcheng/include

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

ifeq ($(JSOC_MACHINE), linux_x86_64)

Line 62 ifeq ($(JSOC_MACHINE), linux_x86_64)

Line 63 ifeq ($(JSOC_MACHINE), linux_x86_64)

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

# CFITSIOL = -L/home/kehcheng/lib/x86_64/

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

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

endif

Line 70 ifeq ($(JSOC_MACHINE), linux_ia32)

Line 72 ifeq ($(JSOC_MACHINE), linux_ia32)

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

# CFITSIOL = -L/home/kehcheng/lib/x86/

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

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

endif

Line 78 ifeq ($(JSOC_MACHINE), mac_osx)

Line 81 ifeq ($(JSOC_MACHINE), mac_osx)

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

# CFITSIOL = -L/home/kehcheng/lib/mac_osx/

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

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

endif

Line 101 endif

Line 105 endif

GCC_CF_GCCCOMP = -DGCCCOMP $(D_GCC_FORT)

ICC_CF_ICCCOMP = -DICCCOMP $(D_GCC_FORT)

# Disable several warnings/remarks when compiling with icc - icc's Wall is a bit picky, it

# complains about extern declarations in .c files.

# 1418 (remark) - external function definition with no prior declaration

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

Line 196 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) $(LIBFITSRW_FPIC)

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

### Standard parts

Line 205 ifneq ($(COMPILER), icc)

Line 208 ifneq ($(COMPILER), icc)

else

SYSLIBS = -lz -ldl -lpthread

endif

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

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

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

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

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

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

Legend:

Removed from v.1.20
changed lines
	Added in v.1.21

Karen Tian