(file) Return to make_basic.mk CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/make_basic.mk between version 1.74 and 1.77

version 1.74, 2012/03/01 14:07:10 version 1.77, 2012/06/11 15:01:20
Line 186  GCC_LF_ALL = $(STATIC)
Line 186  GCC_LF_ALL = $(STATIC)
 ICC_LF_ALL      = $(STATIC) -openmp -static-intel -Wl,-export-dynamic ICC_LF_ALL      = $(STATIC) -openmp -static-intel -Wl,-export-dynamic
  
 # Fortran global LINK flags # Fortran global LINK flags
   ifeq ($(FCOMPILER), ifort)
 F_LF_ALL        = -nofor-main  -openmp -static-intel -Wl,-export-dynamic F_LF_ALL        = -nofor-main  -openmp -static-intel -Wl,-export-dynamic
   endif
 #***********************************************************************************************# #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
Line 302  ifneq ($(COMPILER), icc)
Line 304  ifneq ($(COMPILER), icc)
 else else
   SYSLIBS = -lz -ldl -lpthread   SYSLIBS = -lz -ldl -lpthread
 endif 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,    ############## ########## Libraries to link for server executables,    ##############
 ########## standalone executables and pipeline modules. ############## ########## standalone executables and pipeline modules. ##############
Line 365  $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SO
Line 367  $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SO
 # FMODEXE_SOCK contains all Fortran modules - the DoIt() function is defined inside a .f file. # 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 # These are socket-connect modules only. Assume they use third-party Fortran libraries
 # (although this may not be the case). # (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) $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)


Legend:
Removed from v.1.74  
changed lines
  Added in v.1.77

Karen Tian
Powered by
ViewCVS 0.9.4