(file) Return to configsdp.txt CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/configsdp.txt between version 1.14 and 1.15

version 1.14, 2012/04/05 22:52:18 version 1.15, 2012/09/26 04:50:49
Line 135  __PROJ__
Line 135  __PROJ__
             <subdir>apps</subdir>             <subdir>apps</subdir>
             <subdir>off_flat_IDL</subdir>             <subdir>off_flat_IDL</subdir>
         </subdirs>         </subdirs>
         <filters>  
              <filter>  
                   <name>JSOC_MACHINE</name>  
                   <value>linux_x86_64</value>  
              </filter>  
        </filters>  
    </proj>    </proj>
   <proj>   <proj>
         <name>rings</name>         <name>rings</name>
Line 229  __LIBS__
Line 223  __LIBS__
     POSTGRES_LIB = pq     POSTGRES_LIB = pq
     CFITSIO_LIB = cfitsio     CFITSIO_LIB = cfitsio
  
       ifeq ($(JSOC_MACHINE), linux_avx)
         POSTGRES_INCS = /usr/include
         POSTGRES_LIBS = /usr/lib64
         CFITSIO_INCS = /home/jsoc/avx/include
         CFITSIO_LIBS = /home/jsoc/avx/lib
       endif
   
     ifeq ($(JSOC_MACHINE), linux_x86_64)     ifeq ($(JSOC_MACHINE), linux_x86_64)
       POSTGRES_INCS = /usr/include       POSTGRES_INCS = /usr/include
       POSTGRES_LIBS = /usr/lib64       POSTGRES_LIBS = /usr/lib64
Line 247  __LIBS__
Line 248  __LIBS__
       POSTGRES_INCS = /usr/include/pgsql       POSTGRES_INCS = /usr/include/pgsql
       POSTGRES_LIBS = /usr/lib       POSTGRES_LIBS = /usr/lib
       CFITSIO_INCS = /home/jsoc/include       CFITSIO_INCS = /home/jsoc/include
       CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64        CFITSIO_LIBS = /home/jsoc/lib/linux-ia64
     endif     endif
  
 # JSOC_SDP third-party libraries used by the project directories # JSOC_SDP third-party libraries used by the project directories
     FFTW3_LIB = fftw3  
  
     ifeq ($(JSOC_MACHINE), linux_ia32)     ifeq ($(JSOC_MACHINE), linux_ia32)
       FFTW_INCS = /home/jsoc/include       FFTW_INCS = /home/jsoc/include
       FFTW_LIBS = /home/jsoc/lib/linux-ia32       FFTW_LIBS = /home/jsoc/lib/linux-ia32
         GSL_INCS = /home/jsoc/include
         GSL_LIBS = /home/jsoc/lib/linux-ia32
     endif     endif
  
     ifeq ($(JSOC_MACHINE), linux_x86_64)     ifeq ($(JSOC_MACHINE), linux_x86_64)
       FFTW_INCS = /home/jsoc/include       FFTW_INCS = /home/jsoc/include
       FFTW_LIBS = /home/jsoc/lib/linux-x86_64       FFTW_LIBS = /home/jsoc/lib/linux-x86_64
         GSL_INCS = /home/jsoc/include
         GSL_LIBS = /home/jsoc/lib/linux-x86_64
         MPI_INCS = /home/jsoc/mpich2/include
         MPI_LIBS = /home/jsoc/mpich2/lib
         MPI_PATH = /home/jsoc/mpich2/bin
       endif
   
       ifeq ($(JSOC_MACHINE), linux_avx)
         FFTW_INCS = /home/jsoc/avx/include
         FFTW_LIBS = /home/jsoc/avx/lib
         GSL_INCS = /home/jsoc/avx/include
         GSL_LIBS = /home/jsoc/avx/lib
         MPI_INCS = /home/jsoc/avx/include
         MPI_LIBS = /home/jsoc/avx/lib
         MPI_PATH = /home/jsoc/avx/bin
     endif     endif
  
 # Try to specialize for non-default machines # Try to specialize for non-default machines

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