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

Diff for /JSOC/make_basic.mk between version 1.21 and 1.22

version 1.21, 2008/06/23 18:43:00 version 1.22, 2008/07/14 21:06:04
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
 #CFITSIOH = -I/home/kehcheng/include  
 GSLH = -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)
Line 63  ifeq ($(JSOC_MACHINE), linux_x86_64)
Line 62  ifeq ($(JSOC_MACHINE), linux_x86_64)
   # 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/
 #  CFITSIOL = -L/home/kehcheng/lib/x86_64/  
   GSLL = -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
Line 72  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/
 #  CFITSIOL = -L/home/kehcheng/lib/x86/  
   GSLL = -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
Line 81  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/
 #  CFITSIOL = -L/home/kehcheng/lib/mac_osx/  
   GSLL = -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


Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22

Karen Tian
Powered by
ViewCVS 0.9.4