ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/configsdp.txt
(Generate patch)

Comparing configsdp.txt (file contents):
Revision 1.7 by arta, Tue May 24 17:41:32 2011 UTC vs.
Revision 1.18 by arta, Tue Feb 26 20:18:59 2013 UTC

# Line 135 | Line 135 | __PROJ__
135              <subdir>apps</subdir>
136              <subdir>off_flat_IDL</subdir>
137          </subdirs>
138        <filters>
139             <filter>
140                  <name>JSOC_MACHINE</name>
141                  <value>linux_x86_64</value>
142             </filter>
143       </filters>
138     </proj>
139    <proj>
140          <name>rings</name>
# Line 148 | Line 142 | __PROJ__
142               <subdir>apps</subdir>
143          </subdirs>
144     </proj>
145 +  <proj>
146 +        <name>sharp</name>
147 +        <subdirs>
148 +             <subdir>apps</subdir>
149 +        </subdirs>
150 +   </proj>
151 +  <proj>
152 +        <name>farside</name>
153 +        <subdirs>
154 +             <subdir>apps</subdir>
155 +        </subdirs>
156 +   </proj>
157 +  <proj>
158 +        <name>timed</name>
159 +        <subdirs>
160 +             <subdir>apps</subdir>
161 +        </subdirs>
162 +   </proj>
163     <proj>
164          <name>mag</name>
165          <subdirs>
166               <subdir>apps</subdir>
167               <subdir>pfss/apps</subdir>
168               <subdir>ambig/apps</subdir>
169 +             <subdir>harp/apps</subdir>
170 +             <subdir>harp/libs/matlab/mex/src/util</subdir>
171 +             <subdir>harp/libs/matlab/mex/src/mex2c</subdir>
172 +             <subdir>harp/libs/matlab/mfile-mex/standalone</subdir>
173 +             <subdir>harp/libs/matlab/mfile-mex/assignment</subdir>
174 +             <subdir>harp/libs/matlab/mfile-mex/fits</subdir>
175 +             <subdir>harp/libs/matlab/mfile-mex/hmi-mask-patch</subdir>
176               <subdir>ident/apps</subdir>
177               <subdir>ident/libs/mex2c</subdir>
178               <subdir>ident/libs/mexfunctions</subdir>
# Line 198 | Line 217 | __PROJCFG__
217   # directory).
218  
219   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" \;
201
202 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" \;
220   __END__
221   __LIBS__
222   # JSOC_SDP third-party libraries used by base
223      POSTGRES_LIB = pq
224      CFITSIO_LIB = cfitsio
225  
226 +    ifeq ($(JSOC_MACHINE), linux_avx)
227 +      POSTGRES_INCS = /usr/include
228 +      POSTGRES_LIBS = /usr/lib64
229 +      CFITSIO_INCS = /home/jsoc/avx/include
230 +      CFITSIO_LIBS = /home/jsoc/avx/lib
231 +    endif
232 +
233      ifeq ($(JSOC_MACHINE), linux_x86_64)
234        POSTGRES_INCS = /usr/include
235        POSTGRES_LIBS = /usr/lib64
# Line 224 | Line 248 | __LIBS__
248        POSTGRES_INCS = /usr/include/pgsql
249        POSTGRES_LIBS = /usr/lib
250        CFITSIO_INCS = /home/jsoc/include
251 <      CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64
251 >      CFITSIO_LIBS = /home/jsoc/lib/linux-ia64
252      endif
253  
254   # JSOC_SDP third-party libraries used by the project directories
231    FFTW3_LIB = fftw3
255  
256      ifeq ($(JSOC_MACHINE), linux_ia32)
257        FFTW_INCS = /home/jsoc/include
258        FFTW_LIBS = /home/jsoc/lib/linux-ia32
259 +      GSL_INCS = /home/jsoc/include
260 +      GSL_LIBS = /home/jsoc/lib/linux-ia32
261 +    endif
262 +    
263 +    ifeq ($(JSOC_MACHINE), linux_ia64)
264 +      FFTW_INCS = /home/jsoc/include
265 +      FFTW_LIBS = /home/jsoc/lib/linux-x86_64
266 +      GSL_INCS = /home/jsoc/include
267 +      GSL_LIBS = /home/jsoc/lib/linux-x86_64
268      endif
269  
270      ifeq ($(JSOC_MACHINE), linux_x86_64)
271        FFTW_INCS = /home/jsoc/include
272        FFTW_LIBS = /home/jsoc/lib/linux-x86_64
273 +      GSL_INCS = /home/jsoc/include
274 +      GSL_LIBS = /home/jsoc/lib/linux-x86_64
275 +      MPI_INCS = /home/jsoc/mpich2/include
276 +      MPI_LIBS = /home/jsoc/mpich2/lib
277 +      MPI_PATH = /home/jsoc/mpich2/bin
278 +    endif
279 +
280 +    ifeq ($(JSOC_MACHINE), linux_avx)
281 +      FFTW_INCS = /home/jsoc/avx/include
282 +      FFTW_LIBS = /home/jsoc/avx/lib
283 +      GSL_INCS = /home/jsoc/avx/include
284 +      GSL_LIBS = /home/jsoc/avx/lib
285 +      MPI_INCS = /home/jsoc/avx/include
286 +      MPI_LIBS = /home/jsoc/avx/lib
287 +      MPI_PATH = /home/jsoc/avx/bin
288      endif
289  
290   # Try to specialize for non-default machines

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines