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

Diff for /JSOC/make_basic.mk between version 1.15 and 1.16

version 1.15, 2008/04/10 19:31:19 version 1.16, 2008/04/10 23:26:44
Line 55  endif
Line 55  endif
 # Path to 3rd-party library headers # Path to 3rd-party library headers
 FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include
 CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include
 OPENMPH = -I$(_JSOCROOT_)/lib_third_party/include  GSLH = -I$(_JSOCROOT_)/lib_third_party/include
  
 ifeq ($(JSOC_MACHINE), linux_x86_64) ifeq ($(JSOC_MACHINE), linux_x86_64)
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio
   # Path to 64-bit 3rd-party libraries   # Path to 64-bit 3rd-party libraries
   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
   OPENMPL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/    GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
 endif endif
 ifeq ($(JSOC_MACHINE), linux_ia32) ifeq ($(JSOC_MACHINE), linux_ia32)
Line 70  ifeq ($(JSOC_MACHINE), linux_ia32)
Line 70  ifeq ($(JSOC_MACHINE), linux_ia32)
   # Path to 32-bit 3rd-party libraries   # Path to 32-bit 3rd-party libraries
   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
   OPENMPL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/    GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
 endif endif
 ifeq ($(JSOC_MACHINE), mac_osx) ifeq ($(JSOC_MACHINE), mac_osx)
Line 78  ifeq ($(JSOC_MACHINE), mac_osx)
Line 78  ifeq ($(JSOC_MACHINE), mac_osx)
   # Path to 32-bit 3rd-party libraries   # Path to 32-bit 3rd-party libraries
   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/
   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/
   OPENMPL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/    GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/
 endif endif
  
 # All 3rd-party math libraries - local rules can define a subset # All 3rd-party math libraries - local rules can define a subset
 FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio
 CFITSIOLIBS = $(CFITSIOL) -lcfitsio CFITSIOLIBS = $(CFITSIOL) -lcfitsio
 OPENMPLIBS = $(OPENMPL) -lgsl -lgslcblas  GSLLIBS = $(GSLL) -lgsl -lgslcblas
  
 ### Build flags for all targets ### Build flags for all targets
 # #


Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

Karen Tian
Powered by
ViewCVS 0.9.4