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

Diff for /JSOC/make_basic.mk between version 1.89 and 1.90

version 1.89, 2017/08/16 19:15:49 version 1.90, 2017/09/13 15:25:08
Line 109  endif
Line 109  endif
 PGH = -I$(POSTGRES_INCS) PGH = -I$(POSTGRES_INCS)
  
 # For use of dynamic library # For use of dynamic library
 PGL = -L$(POSTGRES_LIBS)  
 PGLIBS = $(POSTGRES_LIBS)/lib$(POSTGRES_LIB).so PGLIBS = $(POSTGRES_LIBS)/lib$(POSTGRES_LIB).so
  
 # CFITSIO # CFITSIO
Line 222  endif
Line 221  endif
 # #
 LL_ALL          = $(SYSLIBS) -lcurl LL_ALL          = $(SYSLIBS) -lcurl
  
   
 ifeq ($(JSOC_MACHINE), linux_avx) ifeq ($(JSOC_MACHINE), linux_avx)
 GCC_LF_ALL      = $(STATIC) -Wl,--copy-dt-needed-entries GCC_LF_ALL      = $(STATIC) -Wl,--copy-dt-needed-entries
 ICC_LF_ALL      = -diag-disable 10237 $(STATIC) -openmp -static-intel -Wl,-export-dynamic -Wl,--copy-dt-needed-entries ICC_LF_ALL      = -diag-disable 10237 $(STATIC) -openmp -static-intel -Wl,-export-dynamic -Wl,--copy-dt-needed-entries
Line 348  SLLIB = ln -sf ../../_$(MACH)/$@ ../lib
Line 346  SLLIB = ln -sf ../../_$(MACH)/$@ ../lib
 # LIBRARY COLLECTIONS # LIBRARY COLLECTIONS
 # #
 ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDEFS_FPIC) $(LIBMISC_FPIC) $(LIBDSTRUCT_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC) ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDEFS_FPIC) $(LIBMISC_FPIC) $(LIBDSTRUCT_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)
   ALL_LIBS_PY_FPIC = $(LIBDRMS_SERVER_FPIC) $(LIBDB_SERVER_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDEFS_FPIC) $(LIBMISC_FPIC) $(LIBDSTRUCT_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)
  
 ### Standard parts ### Standard parts
 # #

Legend:
Removed from v.1.89  
changed lines
  Added in v.1.90
Karen Tian
 Powered by
ViewCVS 0.9.4