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

Diff for /JSOC/configsdp.txt between version 1.12 and 1.17

version 1.12, 2012/01/26 01:01:27 version 1.17, 2012/12/03 21:45:07
Line 18  $(MODEXESUMS): $(LIBSUM
Line 18  $(MODEXESUMS): $(LIBSUM
  
 $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr
 $(MODEXEDR) $(MODEXEDR_SOCK):   $(LIBDR) $(MODEXEDR) $(MODEXEDR_SOCK):   $(LIBDR)
   CUSTOMSW := $(CUSTOMSW) -DTRACKSHADOWS
 __END__ __END__
 __PROJ__ __PROJ__
 <?xml version='1.0'?> <?xml version='1.0'?>
Line 135  __PROJ__
Line 136  __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 149  __PROJ__
Line 144  __PROJ__
         </subdirs>         </subdirs>
    </proj>    </proj>
   <proj>   <proj>
           <name>sharp</name>
           <subdirs>
                <subdir>apps</subdir>
           </subdirs>
      </proj>
     <proj>
         <name>farside</name>         <name>farside</name>
         <subdirs>         <subdirs>
              <subdir>apps</subdir>              <subdir>apps</subdir>
Line 217  __PROJCFG__
Line 218  __PROJCFG__
 # directory). # directory).
  
 find ../proj/lev0/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \; find ../proj/lev0/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;
   
 find ../proj/datacapture/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;  
 __END__ __END__
 __LIBS__ __LIBS__
 # JSOC_SDP third-party libraries used by base # JSOC_SDP third-party libraries used by base
     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 243  __LIBS__
Line 249  __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
   
       ifeq ($(JSOC_MACHINE), linux_ia64)
         FFTW_INCS = /home/jsoc/include
         FFTW_LIBS = /home/jsoc/lib/linux-x86_64
         GSL_INCS = /home/jsoc/include
         GSL_LIBS = /home/jsoc/lib/linux-x86_64
     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.12  
changed lines
  Added in v.1.17

Karen Tian
Powered by
ViewCVS 0.9.4