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

Diff for /JSOC/make_basic.mk between version 1.80 and 1.81

version 1.80, 2013/11/15 17:05:49 version 1.81, 2014/04/07 14:07:04
Line 128  FFTWL = -L$(FFTW_LIBS)
Line 128  FFTWL = -L$(FFTW_LIBS)
 FFTW3LIBS = $(FFTWL) -lfftw3 FFTW3LIBS = $(FFTWL) -lfftw3
 FFTW3FLIBS = $(FFTWL) -lfftw3f FFTW3FLIBS = $(FFTWL) -lfftw3f
  
   # TAR
   LIBTARH = -I$(TAR_INCS)
   LIBTARL = -L$(TAR_LIBS) -ltar
   
 #***********************************************************************************************# #***********************************************************************************************#
  
  
Line 210  endif
Line 214  endif
 # #
 # Link flags for all targets # Link flags for all targets
 # #
 LL_ALL          = $(SYSLIBS)  LL_ALL          = $(SYSLIBS) -lcurl
 GCC_LF_ALL      = $(STATIC) GCC_LF_ALL      = $(STATIC)
 ICC_LF_ALL      = -diag-disable 10237 $(STATIC) -openmp -static-intel -Wl,-export-dynamic ICC_LF_ALL      = -diag-disable 10237 $(STATIC) -openmp -static-intel -Wl,-export-dynamic
  

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