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

version 1.21, 2008/06/23 18:43:00 version 1.24, 2008/07/15 20:59:32
Line 5  DBNAME = POSTGRESQL
Line 5  DBNAME = POSTGRESQL
 # USED BY NEITHER linux_x86_64 nor linux_ia32 # USED BY NEITHER linux_x86_64 nor linux_ia32
 PGIPATH = /usr/include/pgsql PGIPATH = /usr/include/pgsql
  
   ifeq ($(JSOC_MACHINE), mac_osx)
   COMPILER = gcc
   else
 COMPILER = icc COMPILER = icc
   endif
  
 # Check for debug vs. release build - release is default. # Check for debug vs. release build - release is default.
 #   To do a debug build, either set the environment variable JSOC_DEBUG to 1, OR #   To do a debug build, either set the environment variable JSOC_DEBUG to 1, OR
Line 41  endif
Line 44  endif
  
 _JSOCROOT_ = .. _JSOCROOT_ = ..
  
   ifeq ($(JSOC_MACHINE), mac_osx)
   F77 = f77
   else
 F77 = ifort F77 = ifort
   endif
   
 # if fortran compiler # if fortran compiler
 D_GCC_FORT = D_GCC_FORT =
 ifeq ($(F77), ifort) ifeq ($(F77), ifort)
Line 55  endif
Line 63  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 70  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 78  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 86  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
Line 89  endif
Line 93  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
   ifeq ($(COMPILER), gcc)
           ifeq ($(JSOC_MACHINE), linux_x86_64)
                   FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio_gcc
                   CFITSIOLIBS = $(CFITSIOL) -lcfitsio_gcc
           endif
   endif
   
 GSLLIBS = $(GSLL) -lgsl -lgslcblas GSLLIBS = $(GSLL) -lgsl -lgslcblas
  
 ### Build flags for all targets ### Build flags for all targets

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