Changeset 4707


Ignore:
Timestamp:
07/21/10 18:27:14 (15 years ago)
Author:
Eric.Larour
Message:

Needed to take out blas from the chaco library. Now builds 2 libraries, one with blas, for the
chaco executable, the other one without the blas library, that we use in ISSM.

Location:
issm/trunk/externalpackages/chaco
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/externalpackages/chaco/chaco.patch

    r4636 r4707  
     1Only in src/code/assign: assign.o
    12diff -rc src/code/assign/assign_out.c old/code/assign/assign_out.c
    2 *** src/code/assign/assign_out.c        2010-07-16 16:13:13.106937437 -0700
     3*** src/code/assign/assign_out.c        2010-07-16 16:28:47.352242454 -0700
    34--- old/code/assign/assign_out.c        1995-08-08 14:32:10.000000000 -0700
    45***************
    … …  
    1213 
    1314--- 3,8 ----
     15Only in src/code/assign: assign_out.o
     16Only in src/code/assign: mapper.o
     17Only in src/code/assign: median.o
     18Only in src/code/assign: merge_assign.o
     19Only in src/code/assign: rec_median.o
     20Only in src/code/assign: rotate.o
     21Only in src/code/assign: y2x.o
     22Only in src/code/bpmatch: checkbp.o
     23Only in src/code/bpmatch: genvals2d.o
     24Only in src/code/bpmatch: genvals3d.o
     25Only in src/code/bpmatch: inits2d.o
     26Only in src/code/bpmatch: inits3d.o
     27Only in src/code/bpmatch: map2d.o
     28Only in src/code/bpmatch: map3d.o
     29Only in src/code/bpmatch: movevtxs.o
     30Only in src/code/bpmatch: sorts2d.o
     31Only in src/code/bpmatch: sorts3d.o
     32Only in src/code: chacominusblas.a
     33Only in src/code/coarsen: coarsen1.o
     34Only in src/code/coarsen: coarsen.o
     35Only in src/code/coarsen: interpolate.o
     36Only in src/code/coarsen: makeccoords.o
     37Only in src/code/coarsen: makefgraph.o
     38Only in src/code/coarsen: makev2cv.o
     39Only in src/code/coarsen: maxmatch1.o
     40Only in src/code/coarsen: maxmatch2.o
     41Only in src/code/coarsen: maxmatch3.o
     42Only in src/code/coarsen: maxmatch4.o
     43Only in src/code/coarsen: maxmatch5.o
     44Only in src/code/coarsen: maxmatch.o
     45Only in src/code/connect: add_edges.o
     46Only in src/code/connect: connected.o
     47Only in src/code/connect: find_edges.o
     48Only in src/code/eigen: bidir.o
     49Only in src/code/eigen: bisect.o
     50Only in src/code/eigen: checkeig_ext.o
     51Only in src/code/eigen: checkeig.o
     52Only in src/code/eigen: checkorth.o
     53Only in src/code/eigen: cksturmcnt.o
     54Only in src/code/eigen: eigensolve.o
    1455diff -rc src/code/eigen/get_extval.c old/code/eigen/get_extval.c
    15 *** src/code/eigen/get_extval.c 2010-07-16 16:13:13.107937445 -0700
     56*** src/code/eigen/get_extval.c 2010-07-16 16:28:47.353242463 -0700
    1657--- old/code/eigen/get_extval.c 1995-08-08 14:32:20.000000000 -0700
    1758***************
    … …  
    2566     tridiagonal T using using Rafael's bisection technique. */
    2667--- 4,9 ----
     68Only in src/code/eigen: get_extval.o
     69Only in src/code/eigen: get_ritzvals.o
     70Only in src/code/eigen: lanc_seconds.o
     71Only in src/code/eigen: lanczos_ext_float.o
     72Only in src/code/eigen: lanczos_ext.o
     73Only in src/code/eigen: lanczos_FO.o
     74Only in src/code/eigen: lanczos_SO_float.o
     75Only in src/code/eigen: lanczos_SO.o
     76Only in src/code/eigen: lanpause.o
     77Only in src/code/eigen: makeorthlnk.o
     78Only in src/code/eigen: mkeigvecs.o
     79Only in src/code/eigen: mkscanlist.o
     80Only in src/code/eigen: orthog1.o
     81Only in src/code/eigen: orthogonalize.o
     82Only in src/code/eigen: orthogvec.o
     83Only in src/code/eigen: ql.o
     84Only in src/code/eigen: rqi_ext.o
     85Only in src/code/eigen: rqi.o
     86Only in src/code/eigen: scale_diag.o
     87Only in src/code/eigen: scanmax.o
     88Only in src/code/eigen: scanmin.o
     89Only in src/code/eigen: solistout.o
     90Only in src/code/eigen: sorthog.o
     91Only in src/code/eigen: splarax.o
     92Only in src/code/eigen: sturmcnt.o
     93Only in src/code/eigen: Tevec.o
     94Only in src/code/eigen: tri_solve.o
     95Only in src/code/eigen: warnings.o
     96Only in src/code/graph: check_graph.o
     97Only in src/code/graph: free_graph.o
     98Only in src/code/graph: graph_out.o
     99Only in src/code/graph: reformat.o
     100Only in src/code/graph: subgraph.o
     101Only in src/code/inertial: eigenvec2.o
     102Only in src/code/inertial: eigenvec3.o
     103Only in src/code/inertial: inertial1d.o
     104Only in src/code/inertial: inertial2d.o
     105Only in src/code/inertial: inertial3d.o
     106Only in src/code/inertial: inertial.o
     107Only in src/code/inertial: make_subgeom.o
     108Only in src/code/input: check_input.o
     109Only in src/code/input: input_assign.o
     110Only in src/code/input: input_geom.o
     111Only in src/code/input: input_graph.o
     112Only in src/code/input: input.o
     113Only in src/code/input: read_params.o
     114Only in src/code/input: read_val.o
     115Only in src/code/input: reflect_input.o
     116Only in src/code/internal: check_internal.o
     117Only in src/code/internal: force_internal.o
     118Only in src/code/internal: improve_internal.o
     119Only in src/code/klspiff: bilistops.o
     120Only in src/code/klspiff: buckets1.o
     121Only in src/code/klspiff: buckets_bi.o
     122Only in src/code/klspiff: buckets.o
     123Only in src/code/klspiff: coarsen_kl.o
     124Only in src/code/klspiff: compress_ewgts.o
     125Only in src/code/klspiff: count_weights.o
     126Only in src/code/klspiff: kl_init.o
     127Only in src/code/klspiff: kl_output.o
     128Only in src/code/klspiff: klspiff.o
     129Only in src/code/klspiff: make_bndy_list.o
     130Only in src/code/klspiff: make_kl_list.o
     131Only in src/code/klspiff: nway_kl.o
     132Only in src/code/klvspiff: bpm_improve.o
     133Only in src/code/klvspiff: bucketsv.o
     134Only in src/code/klvspiff: clear_dvals.o
     135Only in src/code/klvspiff: coarsen_klv.o
     136Only in src/code/klvspiff: countup_vtx_sep.o
     137Only in src/code/klvspiff: find_bndy.o
     138Only in src/code/klvspiff: flatten.o
     139Only in src/code/klvspiff: flow.o
     140Only in src/code/klvspiff: klv_init.o
     141Only in src/code/klvspiff: klvspiff.o
     142Only in src/code/klvspiff: make_bpgraph.o
     143Only in src/code/klvspiff: make_sep_list.o
    27144diff -rc src/code/klvspiff/matching.c old/code/klvspiff/matching.c
    28 *** src/code/klvspiff/matching.c        2010-07-16 16:13:13.110937469 -0700
     145*** src/code/klvspiff/matching.c        2010-07-16 16:28:47.356242493 -0700
    29146--- old/code/klvspiff/matching.c        1996-03-11 10:24:25.000000000 -0800
    30147***************
    … …  
    38155  #define  FALSE 0
    39156--- 6,11 ----
     157Only in src/code/klvspiff: matching.o
     158Only in src/code/klvspiff: nway_klv.o
    40159diff -rc src/code/main/defs.h old/code/main/defs.h
    41 *** src/code/main/defs.h        2010-07-16 16:13:13.112937485 -0700
     160*** src/code/main/defs.h        2010-07-16 16:28:47.359242522 -0700
    42161--- old/code/main/defs.h        1995-08-08 14:32:41.000000000 -0700
    43162***************
    … …  
    94213! #define       TWOPI   6.283185307179586
    95214! #define HALFPI  1.570796326794896
     215Only in src/code/main: interface.o
     216Only in src/code/main: main.o
    96217diff -rc src/code/main/params.h old/code/main/params.h
    97 *** src/code/main/params.h      2010-07-16 16:13:13.115937510 -0700
     218*** src/code/main/params.h      2010-07-16 16:28:47.361242541 -0700
    98219--- old/code/main/params.h      1995-08-08 14:32:43.000000000 -0700
    99220***************
    … …  
    112233- #endif //ifndef _CHACO_PARAMS_H_
    113234--- 1,5 ----
     235Only in src/code/main: user_params.o
    114236diff -rc src/code/Makefile old/code/Makefile
    115 *** src/code/Makefile   2010-07-16 16:13:13.117937526 -0700
     237*** src/code/Makefile   2010-07-21 18:22:19.909939194 -0700
    116238--- old/code/Makefile   1997-10-02 10:23:22.000000000 -0700
    117239***************
    … …  
    124246! #OFLAGS =     -O2
    125247! #CFLAGS =     -fPIC -fno-omit-frame-pointer -D_GNU_SOURCE -pthread -fexceptions
    126 ! CFLAGS =      -fPIC -fno-omit-frame-pointer -pthread -fexceptions
     248! CFLAGS =      -fPIC -fno-omit-frame-pointer -pthread -fexceptions -g
    127249! #CFLAGS =     -fPIC -fno-omit-frame-pointer -pthread -fexceptions -DMATLAB
    128   OFLAGS =      -O2
    129 - #AR =             /usr/ccs/bin/ar rcv   # for solaris 2
    130 - AR =             /usr/bin/ar rcv
    131 - #RANLIB =         /usr/ccs/bin/ranlib   # for solaris 2
    132 - RANLIB =         /usr/bin/ranlib
     250! OFLAGS =      -O2
     251! #AR =             /usr/ccs/bin/ar rcv   # for solaris 2
     252! AR =             /usr/bin/ar rcv
     253! #RANLIB =         /usr/ccs/bin/ranlib   # for solaris 2
     254! RANLIB =         /usr/bin/ranlib
    133255 
    134256  FILES.c=      main/user_params.c main/interface.c main/main.c \
    … …  
    139261  IFLAG =               -Imain
    140262! CFLAGS =      -O2
    141   OFLAGS =      -O2
     263! OFLAGS =      -O2
    142264 
    143265  FILES.c=      main/user_params.c main/interface.c main/main.c \
    144266                submain/balance.c submain/divide.c submain/submain.c \
    145267***************
    146 *** 99,109 ****
     268*** 96,196 ****
     269                util/update.c  util/vecout.c util/vecran.c \
     270                  util/vecscale.c
     271 
     272-
     273- FILESMINUSBLAS.c=     main/user_params.c main/interface.c main/main.c \
     274-               submain/balance.c submain/divide.c submain/submain.c \
     275-               input/input_assign.c \
     276-               input/check_input.c input/input.c input/input_geom.c \
     277-               input/input_graph.c input/read_params.c input/reflect_input.c \
     278-               input/read_val.c \
     279-               graph/check_graph.c graph/free_graph.c \
     280-               graph/reformat.c graph/subgraph.c graph/graph_out.c \
     281-               inertial/eigenvec2.c inertial/eigenvec3.c inertial/inertial.c \
     282-               inertial/inertial1d.c inertial/inertial2d.c \
     283-               inertial/inertial3d.c inertial/make_subgeom.c \
     284-               klspiff/buckets.c klspiff/buckets_bi.c klspiff/buckets1.c \
     285-               klspiff/bilistops.c klspiff/coarsen_kl.c klspiff/count_weights.c \
     286-               klspiff/compress_ewgts.c klspiff/kl_init.c klspiff/kl_output.c \
     287-               klspiff/klspiff.c klspiff/make_bndy_list.c \
     288-               klspiff/make_kl_list.c klspiff/nway_kl.c \
     289-               klvspiff/bpm_improve.c klvspiff/bucketsv.c \
     290-               klvspiff/clear_dvals.c klvspiff/coarsen_klv.c \
     291-               klvspiff/countup_vtx_sep.c klvspiff/find_bndy.c klvspiff/flow.c \
     292-               klvspiff/klv_init.c klvspiff/klvspiff.c klvspiff/make_bpgraph.c \
     293-               klvspiff/make_sep_list.c klvspiff/matching.c klvspiff/nway_klv.c \
     294-               klvspiff/flatten.c \
     295-               coarsen/coarsen.c coarsen/interpolate.c coarsen/makefgraph.c \
     296-               coarsen/makeccoords.c \
     297-               coarsen/coarsen1.c coarsen/makev2cv.c \
     298-               coarsen/maxmatch.c coarsen/maxmatch1.c coarsen/maxmatch2.c \
     299-               coarsen/maxmatch3.c coarsen/maxmatch4.c coarsen/maxmatch5.c \
     300-               connect/add_edges.c connect/connected.c connect/find_edges.c \
     301-               eigen/bidir.c eigen/bisect.c eigen/checkeig.c \
     302-               eigen/checkeig_ext.c \
     303-               eigen/checkorth.c eigen/cksturmcnt.c eigen/mkeigvecs.c\
     304-               eigen/eigensolve.c eigen/get_extval.c eigen/get_ritzvals.c \
     305-               eigen/lanczos_FO.c eigen/lanczos_SO.c eigen/lanczos_SO_float.c \
     306-               eigen/lanczos_ext.c eigen/lanczos_ext_float.c eigen/lanc_seconds.c\
     307-               eigen/lanpause.c eigen/makeorthlnk.c eigen/mkscanlist.c \
     308-               eigen/orthog1.c eigen/orthogonalize.c eigen/orthogvec.c \
     309-               eigen/ql.c eigen/rqi.c eigen/rqi_ext.c eigen/scale_diag.c \
     310-               eigen/scanmax.c eigen/scanmin.c eigen/solistout.c \
     311-                 eigen/sorthog.c eigen/splarax.c eigen/sturmcnt.c \
     312-               eigen/Tevec.c eigen/tri_solve.c eigen/warnings.c \
     313-               symmlq/aprod.c symmlq/msolve.c symmlq/pow_dd.c \
     314-               symmlq/symmlq.c  \
     315-               tinvit/tinvit.c tinvit/pythag.c tinvit/epslon.c \
     316-               optimize/determinant.c optimize/func2d.c \
     317-               optimize/func3d.c optimize/opt2d.c optimize/opt3d.c \
     318-               assign/assign.c assign/assign_out.c assign/mapper.c \
     319-               assign/median.c assign/merge_assign.c \
     320-               assign/rec_median.c assign/rotate.c assign/y2x.c \
     321-               bpmatch/checkbp.c bpmatch/inits2d.c bpmatch/inits3d.c \
     322-               bpmatch/genvals2d.c bpmatch/genvals3d.c bpmatch/map2d.c \
     323-               bpmatch/map3d.c bpmatch/movevtxs.c \
     324-               bpmatch/sorts2d.c bpmatch/sorts3d.c \
     325-               refine_map/compute_cube_edata.c refine_map/compute_cube_vdata.c \
     326-               refine_map/refine_cube.c refine_map/update_cube_edata.c \
     327-               refine_map/update_cube_vdata.c refine_map/find_edge_cube.c \
     328-               refine_map/init_cube_edata.c refine_map/compute_mesh_edata.c \
     329-               refine_map/compute_mesh_vdata.c refine_map/find_edge_mesh.c \
     330-               refine_map/init_mesh_edata.c refine_map/refine_mesh.c \
     331-               refine_map/update_mesh_edata.c refine_map/update_mesh_vdata.c \
     332-               refine_map/refine_map.c refine_map/make_comm_graph.c \
     333-               refine_part/refine_part.c refine_part/kl_refine.c \
     334-               refine_part/make_maps_ref.c refine_part/make_terms_ref.c \
     335-               internal/force_internal.c internal/improve_internal.c \
     336-               internal/check_internal.c \
     337-               misc/define_subcubes.c misc/define_submeshes.c \
     338-               misc/divide_procs.c misc/merge_goals.c misc/make_term_props.c \
     339-               misc/count.c misc/countup.c misc/countup_cube.c \
     340-               misc/countup_mesh.c misc/make_subgoal.c \
     341-               misc/find_maxdeg.c misc/make_maps.c misc/make_setlists.c \
     342-               misc/sequence.c misc/perturb.c misc/simple_part.c \
     343-               misc/time_kernels.c misc/timing.c \
     344-               util/affirm.c util/array_alloc_2D.c util/bit_reverse.c \
     345-               util/checkpnt.c util/cpvec.c util/dot.c \
     346-               util/doubleout.c util/input_int.c util/gray.c \
     347-               util/machine_params.c util/makevwsqrt.c util/mkvec.c util/norm.c \
     348-                 util/normalize.c util/mergesort.c \
     349-                 util/randomize.c util/smalloc.c util/bail.c \
     350-               util/scadd.c util/seconds.c util/setvec.c util/shell_sort.c \
     351-               util/strout.c util/tri_prod.c util/true_or_false.c \
     352-               util/update.c  util/vecout.c util/vecran.c \
     353-                 util/vecscale.c
     354-
    147355  FILES.o=      $(FILES.c:.c=.o)
    148  
    149  
    150 ! ${DEST}:      ${FILES.c} chaco.a Makefile
    151 !               ${CC} ${OFLAGS} chaco.a -lm -o ${DEST}
    152 !
    153 ! chaco.a:      ${FILES.o}
    154 !               ${AR} chaco.a ${FILES.o} ; ${RANLIB} chaco.a
     356- FILESMINUSBLAS.o=     $(FILESMINUSBLAS.c:.c=.o)
     357-
     358-
     359- ${DEST}:      ${FILES.c} chaco.a Makefile
     360-               ${CC} ${OFLAGS} chaco.a -lm -o ${DEST}
     361 
     362- chaco.a:      ${FILES.o}
     363-               ${AR} chaco.a ${FILES.o} ; ${RANLIB} chaco.a
     364 
     365! chacominusblas.a:     ${FILESMINUSBLAS.o}
     366!               ${AR} chacominusblas.a ${FILESMINUSBLAS.o} ; ${RANLIB} chacominusblas.a
    155367 
    156368  lint:
    157369                lint ${IFLAG} ${FILES.c} -lm
    158 --- 90,97 ----
     370--- 87,97 ----
     371                util/update.c  util/vecout.c util/vecran.c \
     372                  util/vecscale.c
     373 
    159374  FILES.o=      $(FILES.c:.c=.o)
    160375 
    … …  
    165380  lint:
    166381                lint ${IFLAG} ${FILES.c} -lm
     382Only in src/code/misc: count.o
     383Only in src/code/misc: countup_cube.o
     384Only in src/code/misc: countup_mesh.o
     385Only in src/code/misc: countup.o
     386Only in src/code/misc: define_subcubes.o
     387Only in src/code/misc: define_submeshes.o
     388Only in src/code/misc: divide_procs.o
     389Only in src/code/misc: find_maxdeg.o
     390Only in src/code/misc: make_maps.o
     391Only in src/code/misc: make_setlists.o
     392Only in src/code/misc: make_subgoal.o
     393Only in src/code/misc: make_term_props.o
     394Only in src/code/misc: merge_goals.o
     395Only in src/code/misc: perturb.o
     396Only in src/code/misc: sequence.o
     397Only in src/code/misc: simple_part.o
     398Only in src/code/misc: time_kernels.o
    167399diff -rc src/code/misc/timing.c old/code/misc/timing.c
    168 *** src/code/misc/timing.c      2010-07-16 16:13:13.119937542 -0700
     400*** src/code/misc/timing.c      2010-07-16 16:28:47.366242590 -0700
    169401--- old/code/misc/timing.c      1997-01-03 09:10:52.000000000 -0800
    170402***************
    … …  
    178410 
    179411--- 3,8 ----
     412Only in src/code/misc: timing.o
     413Only in src/code/optimize: determinant.o
     414Only in src/code/optimize: func2d.o
     415Only in src/code/optimize: func3d.o
     416Only in src/code/optimize: opt2d.o
     417Only in src/code/optimize: opt3d.o
     418Only in src/code/refine_map: compute_cube_edata.o
     419Only in src/code/refine_map: compute_cube_vdata.o
     420Only in src/code/refine_map: compute_mesh_edata.o
     421Only in src/code/refine_map: compute_mesh_vdata.o
     422Only in src/code/refine_map: find_edge_cube.o
     423Only in src/code/refine_map: find_edge_mesh.o
     424Only in src/code/refine_map: init_cube_edata.o
     425Only in src/code/refine_map: init_mesh_edata.o
     426Only in src/code/refine_map: make_comm_graph.o
     427Only in src/code/refine_map: refine_cube.o
     428Only in src/code/refine_map: refine_map.o
     429Only in src/code/refine_map: refine_mesh.o
     430Only in src/code/refine_map: update_cube_edata.o
     431Only in src/code/refine_map: update_cube_vdata.o
     432Only in src/code/refine_map: update_mesh_edata.o
     433Only in src/code/refine_map: update_mesh_vdata.o
     434Only in src/code/refine_part: kl_refine.o
     435Only in src/code/refine_part: make_maps_ref.o
     436Only in src/code/refine_part: make_terms_ref.o
     437Only in src/code/refine_part: refine_part.o
     438Only in src/code/submain: balance.o
     439Only in src/code/submain: divide.o
     440Only in src/code/submain: submain.o
     441Only in src/code/symmlq: aprod.o
     442Only in src/code/symmlq: msolve.o
     443Only in src/code/symmlq: pow_dd.o
     444diff -rc src/code/symmlq/symmlqblas.f old/code/symmlq/symmlqblas.f
     445*** src/code/symmlq/symmlqblas.f        2010-07-21 18:09:10.370123273 -0700
     446--- old/code/symmlq/symmlqblas.f        2010-07-21 14:02:09.633743650 -0700
     447***************
     448*** 16,22 ****
     449  c     uses unrolled loops for increments equal to one.
     450  c     jack dongarra, linpack, 3/11/78.
     451  c
     452!       double precision dx(1),dy(1),da
     453        integer i,incx,incy,ix,iy,m,mp1,n
     454  c
     455        if(n.le.0)return
     456--- 16,22 ----
     457  c     uses unrolled loops for increments equal to one.
     458  c     jack dongarra, linpack, 3/11/78.
     459  c
     460!       double precision dx(*),dy(*),da
     461        integer i,incx,incy,ix,iy,m,mp1,n
     462  c
     463        if(n.le.0)return
     464Only in src/code/symmlq: symmlqblas.o
     465Only in src/code/symmlq: symmlq.o
     466Only in src/code/tinvit: epslon.o
     467Only in src/code/tinvit: pythag.o
     468Only in src/code/tinvit: tinvit.o
     469Only in src/code/util: affirm.o
     470Only in src/code/util: array_alloc_2D.o
    180471diff -rc src/code/util/bail.c old/code/util/bail.c
    181 *** src/code/util/bail.c        2010-07-16 16:13:13.121937558 -0700
     472*** src/code/util/bail.c        2010-07-16 16:28:47.368242609 -0700
    182473--- old/code/util/bail.c        1995-08-08 14:33:01.000000000 -0700
    183474***************
    … …  
    201492      if (msg != NULL && (int) strlen(msg) > 0) {
    202493          printf("%s\n", msg);
     494Only in src/code/util: bail.o
     495Only in src/code/util: bit_reverse.o
    203496diff -rc src/code/util/checkpnt.c old/code/util/checkpnt.c
    204 *** src/code/util/checkpnt.c    2010-07-16 16:13:13.123937575 -0700
     497*** src/code/util/checkpnt.c    2010-07-16 16:28:47.370242629 -0700
    205498--- old/code/util/checkpnt.c    1995-08-08 14:33:01.000000000 -0700
    206499***************
    … …  
    214507  void      checkpnt(tag)
    215508--- 4,9 ----
     509Only in src/code/util: checkpnt.o
     510Only in src/code/util: cpvec.o
     511Only in src/code/util: dot.o
    216512diff -rc src/code/util/doubleout.c old/code/util/doubleout.c
    217 *** src/code/util/doubleout.c   2010-07-16 16:13:13.124937583 -0700
     513*** src/code/util/doubleout.c   2010-07-16 16:28:47.372242648 -0700
    218514--- old/code/util/doubleout.c   1995-08-08 14:33:02.000000000 -0700
    219515***************
    … …  
    227523  void      doubleout(number, mode)
    228524--- 3,8 ----
     525Only in src/code/util: doubleout.o
     526Only in src/code/util: gray.o
     527Only in src/code/util: input_int.o
     528Only in src/code/util: machine_params.o
     529Only in src/code/util: makevwsqrt.o
     530Only in src/code/util: mergesort.o
     531Only in src/code/util: mkvec.o
     532Only in src/code/util: normalize.o
     533Only in src/code/util: norm.o
     534Only in src/code/util: randomize.o
     535Only in src/code/util: scadd.o
     536Only in src/code/util: seconds.o
     537Only in src/code/util: setvec.o
     538Only in src/code/util: shell_sort.o
    229539diff -rc src/code/util/smalloc.c old/code/util/smalloc.c
    230 *** src/code/util/smalloc.c     2010-07-16 16:13:13.126937599 -0700
     540*** src/code/util/smalloc.c     2010-07-16 16:28:47.375242677 -0700
    231541--- old/code/util/smalloc.c     1996-03-11 10:44:07.000000000 -0800
    232542***************
    … …  
    240550  static int nfree = 0;         /* number of calls to free */
    241551--- 4,9 ----
     552Only in src/code/util: smalloc.o
    242553diff -rc src/code/util/strout.c old/code/util/strout.c
    243 *** src/code/util/strout.c      2010-07-16 16:13:13.128937615 -0700
     554*** src/code/util/strout.c      2010-07-16 16:28:47.377242697 -0700
    244555--- old/code/util/strout.c      1995-08-08 14:33:05.000000000 -0700
    245556***************
    … …  
    253564     Prints to screen and to output file if there is one. */
    254565--- 4,9 ----
     566Only in src/code/util: strout.o
     567Only in src/code/util: tri_prod.o
     568Only in src/code/util: true_or_false.o
     569Only in src/code/util: update.o
     570Only in src/code/util: vecout.o
     571Only in src/code/util: vecran.o
     572Only in src/code/util: vecscale.o

  • issm/trunk/externalpackages/chaco/install.sh

    r4636 r4707  
    2626cd src/code
    2727make -j $NUMCPUS
     28make -j $NUMCPUS chacominusblas.a
    2829
    2930# Clean up objects (but not library or executable)
    … …  
    4243mkdir install/lib
    4344mv src/code/chaco.a install/lib/libchaco.a
     45mv src/code/chacominusblas.a install/lib/libchacominusblas.a
    4446mkdir install/exec
    4547mv src/exec/chaco install/exec
Note: See TracChangeset for help on using the changeset viewer.