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.75 and 1.77

version 1.75, 2012/03/15 16:08:05

version 1.77, 2012/06/11 15:01:20

Line 304 ifneq ($(COMPILER), icc)

else

SYSLIBS = -lz -ldl -lpthread

endif

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

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

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

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

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

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

Line 367 $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SO

# FMODEXE_SOCK contains all Fortran modules - the DoIt() function is defined inside a .f file.

# These are socket-connect modules only. Assume they use third-party Fortran libraries

# (although this may not be the case).

$(FMODEXE_SOCK): LL_TGT := $(LL_TGT) $(CFITSIOLIBS)

$(FMODEXE_SOCK): LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)

$(FMODEXE_SOCK): %_sock: %.o $(FMODLIBS_SOCK)

$(FLINK)

$(SLBIN)

Legend:

Removed from v.1.75
changed lines
	Added in v.1.77

Karen Tian