(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.92

version 1.89, 2017/08/16 19:15:49 version 1.92, 2021/02/13 19:16:51
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
 CFITSIOH = -I$(CFITSIO_INCS) CFITSIOH = -I$(CFITSIO_INCS)
 CFITSIOL = -L$(CFITSIO_LIBS) CFITSIOL = -L$(CFITSIO_LIBS)
 CFITSIOLIBNAME = $(CFITSIO_LIB) CFITSIOLIBNAME = $(CFITSIO_LIB)
 CFITSIOLIBS = $(CFITSIOL) -l$(CFITSIOLIBNAME)  # make sure to use static library so we don't have to deal with locating the dynamic one at run time
   # set back to dynamic (the default) for the other libraries that could follow cfitsio
   CFITSIOLIBS = $(CFITSIOL) -Wl,-Bstatic -l$(CFITSIOLIBNAME) -Wl,-Bdynamic
   # end CFITSIO
  
 # GSL # GSL
 GSLH = -I$(GSL_INCS) GSLH = -I$(GSL_INCS)
Line 176  endif
Line 178  endif
 # All modules must be able to find libdsds.so. The define DRMS_LIBDIR specifies the path to # All modules must be able to find libdsds.so. The define DRMS_LIBDIR specifies the path to
 # all libraries. # all libraries.
  
 GLOBALSW = -DDRMS_ARCH="\"$(MACH)\""  GLOBALSW = -DDRMS_ARCH="\"$(MACH)\"" -DDRMS_MAKE_ROOT_DIRECTORY="\"$(SRCDIR)\""
 # #
 #***********************************************************************************************# #***********************************************************************************************#
  
Line 222  endif
Line 224  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 349  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.92
Karen Tian
 Powered by
ViewCVS 0.9.4