Changeset 4426


Ignore:
Timestamp:
Feb 9, 2023, 5:27:51 PM (15 months ago)
Author:
Laurent Fairhead
Message:

Travail de fermeture du ticket #115: harmonisation des LIBDIR INCDIR dans les arch

Location:
LMDZ6/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/arch/arch-X64_IRENE-AMD.path

    r3644 r4426  
    1 NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR -lnetcdf -lnetcdff"
    2 NETCDF_INCDIR=-I$NETCDFFORTRAN_INCDIR
    3 IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
    4 IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
    5 ORCH_INCDIR=$LMDGCM/../../lib
    6 ORCH_LIBDIR=$LMDGCM/../../lib
    7 OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1
    8 OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
    9 INCA_LIBDIR=$LMDGCM/../INCA/build/lib
    10 INCA_INCDIR=$LMDGCM/../INCA/build/inc
    11 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    12 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1NETCDF_INCDIR="-I$NETCDFFORTRAN_INCDIR"
     2NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR"
     3NETCDF_LIB="-lnetcdff -lnetcdf"
     4
     5IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
     6IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib"
     7IOIPSL_LIB="-lioipsl"
     8
     9XIOS_INCDIR="-I$LMDGCM/../XIOS/inc"
     10XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib"
     11XIOS_LIB="-lxios -lstdc++"
     12
     13ORCH_INCDIR="-I$LMDGCM/../../lib"
     14ORCH_LIBDIR="-L$LMDGCM/../../lib"
     15ORCH_LIB=
     16
     17OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
     18OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib"
     19OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
     20
     21INCA_INCDIR="-I$LMDGCM/../INCA/build/inc"
     22INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
     23INCA_LIB="-lchimie"
     24
     25

  • LMDZ6/trunk/arch/arch-X64_IRENE.path

    r3464 r4426  
    1 NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR -lnetcdf -lnetcdff"
    2 NETCDF_INCDIR=-I$NETCDFFORTRAN_INCDIR
    3 IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
    4 IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
    5 ORCH_INCDIR=$LMDGCM/../../lib
    6 ORCH_LIBDIR=$LMDGCM/../../lib
    7 OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1
    8 OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
    9 INCA_LIBDIR=$LMDGCM/../INCA/build/lib
    10 INCA_INCDIR=$LMDGCM/../INCA/build/inc
    11 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    12 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1
     2NETCDF_INCDIR="-I$NETCDFFORTRAN_INCDIR"
     3NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR"
     4NETCDF_LIB="-lnetcdff -lnetcdf"
     5
     6IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
     7IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib"
     8IOIPSL_LIB="-lioipsl"
     9
     10XIOS_INCDIR="-I$LMDGCM/../XIOS/inc"
     11XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib"
     12XIOS_LIB="-lxios -lstdc++"
     13
     14ORCH_INCDIR="-I$LMDGCM/../../lib"
     15ORCH_LIBDIR="-L$LMDGCM/../../lib"
     16ORCH_LIB=
     17
     18OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
     19OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib"
     20OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
     21
     22INCA_INCDIR="-I$LMDGCM/../INCA/build/inc"
     23INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
     24INCA_LIB="-lchimie"

  • LMDZ6/trunk/arch/arch-X64_JEANZAY.path

    r4362 r4426  
    22#NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR -lnetcdf -lnetcdff"
    33#NETCDF_INCDIR=-I$NETCDFFORTRAN_INCDIR
    4 NETCDF_LIBDIR="-lnetcdf -lnetcdff"
    5 NETCDF_INCDIR=
    6 IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
    7 IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
    8 ORCH_INCDIR=$LMDGCM/../../lib
    9 ORCH_LIBDIR=$LMDGCM/../../lib
    10 OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1
    11 OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
    12 INCA_LIBDIR=$LMDGCM/../INCA/build/lib
    13 INCA_INCDIR=$LMDGCM/../INCA/build/inc
    14 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    15 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     4NETCDF_INCDIR=""
     5NETCDF_LIBDIR=""
     6NETCDF_LIB="-lnetcdff -lnetcdf"
     7
     8IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
     9IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib"
     10IOIPSL_LIB="-lioipsl"
     11
     12XIOS_INCDIR="-I$LMDGCM/../XIOS/inc"
     13XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib"
     14XIOS_LIB="-lxios -lstdc++"
     15
     16ORCH_INCDIR="-I$LMDGCM/../../lib"
     17ORCH_LIBDIR="-L$LMDGCM/../../lib"
     18ORCH_LIB=
     19
     20OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
     21OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib"
     22OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
     23
     24INCA_INCDIR="-I$LMDGCM/../INCA/build/inc"
     25INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
     26INCA_LIB="-lchimie"

  • LMDZ6/trunk/arch/arch-gfortran.path

    r4278 r4426  
    1 NETCDF_LIBDIR="-lnetcdff"
    2 NETCDF_INCDIR=-I/usr/include
    3 IOIPSL_INCDIR=$LMDGCM/../../lib
    4 IOIPSL_LIBDIR=$LMDGCM/../../lib
    5 ORCH_INCDIR=$LMDGCM/../../lib
    6 ORCH_LIBDIR=$LMDGCM/../../lib
     1NETCDF_INCDIR="-I/usr/include"
     2NETCDF_LIBDIR=""
     3NETCDF_LIB="-lnetcdff -lnetcdf"
     4
     5IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
     6IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib"
     7IOIPSL_LIB="-lioipsl"
     8
     9XIOS_INCDIR="-I$LMDGCM/../XIOS/inc"
     10XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib"
     11XIOS_LIB="-lxios -lstdc++"
     12
     13ORCH_INCDIR="-I$LMDGCM/../../lib"
     14ORCH_LIBDIR="-L$LMDGCM/../../lib"
     15ORCH_LIB=
     16
     17OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
     18OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib"
     19OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
     20
     21INCA_INCDIR="-I$LMDGCM/../INCA/build/inc"
     22INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
     23INCA_LIB="-lchimie"

  • LMDZ6/trunk/arch/arch-ifort_MESOIPSL.path

    r4303 r4426  
    11NETCDF_INCDIR="-I $NETCDF_FORTRAN_ROOT/include -I${HDF5_ROOT}/include"
    2 NETCDF_LIBDIR="-L${NETCDF_FORTRAN_ROOT}/lib -lnetcdff -L${NETCDF_C_ROOT}/lib -lnetcdf -L${HDF5_ROOT}/lib -lhdf5_hl -lhdf5 -lz -lcurl -lstdc++"
    3 IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
    4 IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
    5 ORCH_INCDIR=$LMDGCM/../../lib
    6 ORCH_LIBDIR=$LMDGCM/../../lib
    7 OASIS_INCDIR=$LMDGCM/../../prism/SX/build/lib/psmile.$couple
    8 OASIS_LIBDIR=$LMDGCM/../../prism/SX/lib
    9 INCA_LIBDIR=$LMDGCM/../INCA/config/lib
    10 INCA_INCDIR=$LMDGCM/../INCA/config/lib
    11 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    12 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     2NETCDF_LIBDIR="-L${NETCDF_FORTRAN_ROOT}/lib -L${NETCDF_C_ROOT}/lib -L${HDF5_ROOT}"
     3NETCDF_LIB="-lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lz -lcurl -lstdc++"
    134
     5IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
     6IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib"
     7IOIPSL_LIB="-lioipsl"
     8
     9XIOS_INCDIR="-I$LMDGCM/../XIOS/inc"
     10XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib"
     11XIOS_LIB="-lxios -lstdc++"
     12
     13ORCH_INCDIR="-I$LMDGCM/../../lib"
     14ORCH_LIBDIR="-L$LMDGCM/../../lib"
     15ORCH_LIB=
     16
     17OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
     18OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib"
     19OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
     20
     21INCA_INCDIR="-I$LMDGCM/../INCA/build/inc"
     22INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
     23INCA_LIB="-lchimie"
     24
     25
     26

  • LMDZ6/trunk/makelmdz

    r4408 r4426  
    374374then
    375375   CPP_KEY="$CPP_KEY INCA"
    376    INCLUDE="$INCLUDE -I${INCA_INCDIR}"
    377    LIB="$LIB -L${INCA_LIBDIR} -lchimie"
    378    libchimie=" -L${INCA_LIBDIR} -lchimie"
     376   INCLUDE="$INCLUDE ${INCA_INCDIR}"
     377   LIB="$LIB ${INCA_LIBDIR} ${INCA_LIB}"
     378   libchimie=" ${INCA_LIBDIR} ${INCA_LIB}"
    379379fi
    380380
    … …  
    382382then
    383383   CPP_KEY="$CPP_KEY CPP_COUPLE"
    384    INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
    385    LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.${couple} -lmpp_io"
     384   INCLUDE="$INCLUDE ${OASIS_INCDIR}"
     385   LIB="$LIB ${OASIS_LIBDIR} ${OASIS_LIB}"
    386386fi
    387387
    … …  
    446446then
    447447
    448    INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
     448   INCLUDE="${INCLUDE} ${ORCH_INCDIR}"
    449449   CPP_KEY="$CPP_KEY CPP_VEGET"
    450450# temporary, for Orchidee versions 1.9.* (before openmp activation)
    … …  
    453453   fi
    454454   if [[ "$veget" == "orchidee2.0" ]] ; then
    455       orch_libs="sechiba parameters stomate parallel orglob orchidee"
     455      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
    456456      CPP_KEY="$CPP_KEY ORCHIDEE_NOUNSTRUCT"
    457457   elif [[ "$veget" == "orchidee2.1" ]] ; then
    458458      CPP_KEY="$CPP_KEY ORCHIDEE_NOLIC"
    459       orch_libs="sechiba parameters stomate parallel orglob orchidee"
     459      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
    460460   elif [[ "$veget" == "orchideetrunk" ]] ; then
    461       orch_libs="orchidee"
     461      orch_libs="-lorchidee"
    462462   else
    463       orch_libs="sechiba parameters stomate parallel orglob"
     463      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob"
    464464   fi
    465    LIB="${LIB} -L${ORCH_LIBDIR}"
    466    for lib in ${orch_libs} ; do
    467       if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
    468          LIB="${LIB} -l${LIBPREFIX}$lib "
    469       fi
    470    done
     465   LIB="${LIB} ${ORCH_LIBDIR} ${orch_libs}"
     466#   for lib in ${orch_libs} ; do
     467#      if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
     468#         LIB="${LIB} -l${LIBPREFIX}$lib "
     469#      fi
     470#   done
    471471elif [[ "$veget" != "false" ]] ; then
    472472   echo "Option -v $veget does not exist"
    … …  
    479479then
    480480   CPP_KEY="$CPP_KEY CPP_IOIPSL"
    481    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    482    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
     481   INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
     482   LIB="$LIB ${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
    483483elif [[ $io == mix ]]
    484484then
    485485   # For now, xios implies also using ioipsl
    486486   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
    487    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    488    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
     487   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     488   LIB="$LIB ${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl ${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
    489489elif [[ $io == xios ]]
    490490then
    491491   # For now, xios implies also using ioipsl
    492492   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
    493    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    494    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
     493   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     494   LIB="$LIB ${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl ${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
    495495fi
    496496
    … …  
    557557
    558558INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
    559 LIB="$LIB ${NETCDF_LIBDIR}"
     559LIB="$LIB ${NETCDF_LIBDIR} ${NETCDF_LIB}"
    560560
    561561########################################################################

  • LMDZ6/trunk/makelmdz_fcm

    r4283 r4426  
    370370then
    371371   CPP_KEY="$CPP_KEY INCA"
    372    INCLUDE="$INCLUDE -I${INCA_INCDIR}"
    373    LIB="$LIB -L${INCA_LIBDIR} -lchimie"
     372   INCLUDE="$INCLUDE ${INCA_INCDIR}"
     373   LIB="$LIB ${INCA_LIBDIR} ${INCA_LIB}"
    374374fi
    375375
    … …  
    405405    else
    406406        CPP_KEY="$CPP_KEY CPP_COUPLE CPP_OMCT"
    407         INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
    408         LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lscrip -lmct -lmpeu"
     407        INCLUDE="$INCLUDE ${OASIS_INCDIR}"
     408        LIB="$LIB ${OASIS_LIBDIR} -lpsmile.MPI1 -lscrip -lmct -lmpeu"
    409409    fi
    410410fi
    … …  
    436436if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" -o "$veget" = "orchideetrunk" ]
    437437then
     438        echo "doing orchidee"
    438439#NB: option 'true': for backward compatibility. To be used with ORCHIDEE tag 1.9-1.9.6
    439440#    For this case, cpp flag ORCHIDEE_NOOPENMP must be added to the makelmdz_fcm arguments
    440441#    option orchidee1.9 : Compile with ORCHIDEE version up to the inclusion of OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
    441    INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
     442   INCLUDE="${INCLUDE} ${ORCH_INCDIR}"
    442443   CPP_KEY="$CPP_KEY CPP_VEGET"
    443444# temporary, for Orchidee versions 1.9.* (before openmp activation)
    … …  
    446447   fi
    447448   if [[ "$veget" == "orchidee2.0" ]] ; then
    448       orch_libs="sechiba parameters stomate parallel orglob orchidee"
     449      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
    449450      CPP_KEY="$CPP_KEY ORCHIDEE_NOUNSTRUCT"
    450451   elif [[ "$veget" == "orchidee2.1" ]] ; then
    451452      CPP_KEY="$CPP_KEY ORCHIDEE_NOLIC"
    452       orch_libs="sechiba parameters stomate parallel orglob orchidee"
     453      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
    453454   elif [[ "$veget" == "orchideetrunk" ]] ; then
    454       orch_libs="orchidee"
     455      orch_libs="-lorchidee"
    455456   else
    456       orch_libs="sechiba parameters stomate parallel orglob"
     457      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob"
    457458   fi
    458    LIB="${LIB} -L${ORCH_LIBDIR}"
    459    for lib in ${orch_libs} ; do
    460       if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
    461          LIB="${LIB} -l${LIBPREFIX}$lib "
    462       fi
    463    done
     459   LIB="${LIB} ${ORCH_LIBDIR} ${orch_libs}"
     460#   for lib in ${orch_libs} ; do
     461#      if [ -f ${ORCH_LIBDIR#-L}/lib${LIBPREFIX}$lib.a ] ; then
     462#         LIB="${LIB} -l${LIBPREFIX}$lib "
     463#      fi
     464#   done
     465   echo "orchidee lib"
     466   echo ${LIB}
    464467elif [[ "$veget" != "false" ]] ; then
    465468   echo "Option -v $veget does not exist"
    … …  
    501504then
    502505   CPP_KEY="$CPP_KEY CPP_IOIPSL"
    503    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    504    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
     506   INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
     507   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB}"
    505508elif [[ $io == mix ]]
    506509then
    507510   # For now, xios implies also using ioipsl
    508511   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
    509    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    510    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
     512   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     513   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
    511514elif [[ $io == xios ]]
    512515then
    513516   # For now, xios implies also using ioipsl
    514517   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
    515    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    516    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
     518   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     519   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
    517520fi
    518521
    … …  
    545548
    546549INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
    547 LIB="$LIB ${NETCDF_LIBDIR}"
     550LIB="$LIB ${NETCDF_LIBDIR} ${NETCDF_LIB}"
    548551
    549552########################################################################
Note: See TracChangeset for help on using the changeset viewer.