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

Diff for /JSOC/make_basic.mk between version 1.28 and 1.29

version 1.28, 2008/10/08 23:46:15 version 1.29, 2008/10/16 21:50:49
Line 8  DBNAME = POSTGRESQL
Line 8  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
   ifeq ($(JSOC_MACHINE), mac_osx_ppc)
   COMPILER = gcc
   endif
   ifeq ($(JSOC_MACHINE), mac_osx_ia32)
   COMPILER = gcc
 endif 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
 #   modify the following line so that DEBUG = 1.  The environment variable takes precedence.  #  modify the following line so that DEBUG = 1.  The environment variable takes
   #  precedence.
 DEBUG = 1 DEBUG = 1
  
 ifdef JSOC_DEBUG ifdef JSOC_DEBUG
Line 30  endif
Line 33  endif
 # No warnings are displayed, by default, for a release build. # No warnings are displayed, by default, for a release build.
 WARN = 0 WARN = 0
  
 # Builder can request warnings via environment variable (setenv JSOC_WARN 1).  The  # Builder can request warnings via environment variable (setenv JSOC_WARN 1).
 #   environment variable takes precedence.  #   The environment variable takes precedence.
 ifdef JSOC_WARN ifdef JSOC_WARN
 ifeq ($(JSOC_WARN), 1) ifeq ($(JSOC_WARN), 1)
 WARN = 1 WARN = 1
Line 84  ifeq ($(JSOC_MACHINE), linux_ia32)
Line 87  ifeq ($(JSOC_MACHINE), linux_ia32)
   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
 ifeq ($(JSOC_MACHINE), mac_osx)  ifeq ($(JSOC_MACHINE), mac_osx_ppc)
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio
   # Path to 32-bit 3rd-party libraries    # Path to appropriate 3rd-party libraries
   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/    FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/    CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/    GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/    ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   endif
   ifeq ($(JSOC_MACHINE), mac_osx_ia32)
   #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio
     # Path to appropriate 3rd-party libraries
     FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
     CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
     GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
     ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
 endif endif
  
 # All 3rd-party math libraries - local rules can define a subset # All 3rd-party math libraries - local rules can define a subset


Legend:
Removed from v.1.28  
changed lines
  Added in v.1.29

Karen Tian
Powered by
ViewCVS 0.9.4