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

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

version 1.90, 2017/09/13 15:25:08 version 1.92, 2021/02/13 19:16:51
Line 115  PGLIBS = $(POSTGRES_LIBS)/lib$(POSTGRES_
Line 115  PGLIBS = $(POSTGRES_LIBS)/lib$(POSTGRES_
 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 175  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)\""
 # #
 #***********************************************************************************************# #***********************************************************************************************#
  


Legend:
Removed from v.1.90  
changed lines
  Added in v.1.92

Karen Tian
Powered by
ViewCVS 0.9.4