Changeset 5685


Ignore:
Timestamp:
10/29/08 15:47:57 (5 years ago)
Author:
wehart
Message:

Update of externals. This is a first step towards
flushing out acro-colin externals.

Misc updates of config/Make files.

Location:
acro-colin/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • acro-colin/trunk/configure.ac

    r5677 r5685  
    762762# coin-ipopt 
    763763ACRO_ARG_ENABLE_PACKAGE(coin_ipopt, COIN_IPOPT, coin-ipopt, 
    764        ${srcdir}/tpl/coin-ipopt/Makefile.am, yes) 
     764       ${srcdir}/tpl/coin-ipopt/Makefile.am, no) 
    765765if test X${ac_cv_enable_coin_ipopt} = Xyes ; then 
    766766   if test -d ${srcdir}/tpl/coin-ipopt ; then 
     
    955955# mumps 
    956956ACRO_ARG_ENABLE_PACKAGE(mumps, MUMPS, mumps, 
    957        ${srcdir}/tpl/mumps/Makefile.am, yes) 
     957       ${srcdir}/tpl/mumps/Makefile.am, no) 
    958958if test X${ac_cv_enable_mumps} = Xyes ; then 
    959959   if test -d ${srcdir}/tpl/mumps ; then 
  • acro-colin/trunk/packages

    • Property svn:externals
      •  

        old new  
        1 coopr    https://software.sandia.gov/svn/public/coopr/coopr/branches/coopr_dev 
        2 colin    https://software.sandia.gov/svn/public/acro/colin/trunk 
        3 coliny   https://software.sandia.gov/svn/public/acro/coliny/trunk 
        4 dummy    https://software.sandia.gov/svn/public/acro/acro-root/trunk/packages/dummy 
        5 fast     https://software.sandia.gov/svn/public/fast/fast/trunk 
        6 pebbl    https://software.sandia.gov/svn/public/acro/pebbl/trunk 
        7 pyutilib https://software.sandia.gov/svn/public/pyutilib/trunk 
        8 sacache  https://software.sandia.gov/svn/public/sacache/trunk 
        9 utilib   https://software.sandia.gov/svn/public/utilib/utilib/trunk 
         1colin      https://software.sandia.gov/svn/public/acro/colin/trunk 
         2coliny     https://software.sandia.gov/svn/public/acro/coliny/trunk 
         3coopr      https://software.sandia.gov/svn/public/coopr/coopr/branches/coopr_dev 
         4dummy      https://software.sandia.gov/svn/public/acro/acro-root/trunk/packages/dummy 
         5fast       https://software.sandia.gov/svn/public/fast/fast/trunk 
         6interfaces https://software.sandia.gov/svn/public/acro/interfaces/trunk 
         7optpp      https://software.sandia.gov/svn/public/optpp/optpp/trunk 
         8pebbl      https://software.sandia.gov/svn/public/acro/pebbl/trunk 
         9pyutilib   https://software.sandia.gov/svn/public/pyutilib/trunk 
         10sacache    https://software.sandia.gov/svn/public/sacache/trunk 
         11utilib     https://software.sandia.gov/svn/public/utilib/utilib/trunk 
  • acro-colin/trunk/packages/Externals

    r5661 r5685  
    1 coopr    https://software.sandia.gov/svn/public/coopr/coopr/branches/coopr_dev 
    2 colin    https://software.sandia.gov/svn/public/acro/colin/trunk 
    3 coliny   https://software.sandia.gov/svn/public/acro/coliny/trunk 
    4 dummy    https://software.sandia.gov/svn/public/acro/acro-root/trunk/packages/dummy 
    5 fast     https://software.sandia.gov/svn/public/fast/fast/trunk 
    6 pebbl    https://software.sandia.gov/svn/public/acro/pebbl/trunk 
    7 pyutilib https://software.sandia.gov/svn/public/pyutilib/trunk 
    8 sacache  https://software.sandia.gov/svn/public/sacache/trunk 
    9 utilib   https://software.sandia.gov/svn/public/utilib/utilib/trunk 
     1colin      https://software.sandia.gov/svn/public/acro/colin/trunk 
     2coliny     https://software.sandia.gov/svn/public/acro/coliny/trunk 
     3coopr      https://software.sandia.gov/svn/public/coopr/coopr/branches/coopr_dev 
     4dummy      https://software.sandia.gov/svn/public/acro/acro-root/trunk/packages/dummy 
     5fast       https://software.sandia.gov/svn/public/fast/fast/trunk 
     6interfaces https://software.sandia.gov/svn/public/acro/interfaces/trunk 
     7optpp      https://software.sandia.gov/svn/public/optpp/optpp/trunk 
     8pebbl      https://software.sandia.gov/svn/public/acro/pebbl/trunk 
     9pyutilib   https://software.sandia.gov/svn/public/pyutilib/trunk 
     10sacache    https://software.sandia.gov/svn/public/sacache/trunk 
     11utilib     https://software.sandia.gov/svn/public/utilib/utilib/trunk 
  • acro-colin/trunk/tpl

    • Property svn:externals
      •  

        old new  
        11ampl        https://software.sandia.gov/svn/public/tpl/ampl/trunk 
         2appspack    https://software.sandia.gov/svn/public/appspack/appspack/tags/5.0 
        23coin-ipopt  https://software.sandia.gov/svn/public/tpl/coin-ipopt/trunk 
        34cxxtest     http://cxxtest.tigris.org/svn/cxxtest/branches/token-parser 
  • acro-colin/trunk/tpl/Externals

    r5677 r5685  
    11ampl        https://software.sandia.gov/svn/public/tpl/ampl/trunk 
     2appspack    https://software.sandia.gov/svn/public/appspack/appspack/tags/5.0 
    23coin-ipopt  https://software.sandia.gov/svn/public/tpl/coin-ipopt/trunk 
    34cxxtest     http://cxxtest.tigris.org/svn/cxxtest/branches/token-parser 
  • acro-colin/trunk/tpl/Makefile.am

    r5677 r5685  
    9090DIST_SUBDIRS=. $(AMPL_DIR) $(HSL_DIR) $(NPSOL_DIR) $(SNOPT_DIR) $(CONMIN_DIR) $(GLPK_DIR) $(MTL_DIR) $(TRILINOS_DIR) $(THREEPO_DIR) $(SOPLEX_DIR) $(FILIB_DIR) $(DSCPACK_DIR) $(MUMPS_DIR) $(COIN_CBC_DIR) $(MOMHLIB_DIR) $(EO_DIR) $(COIN_IPOPT_DIR) $(TINYXML_DIR) 
    9191 
    92 all-local: python ampl_headers 
     92all-local: python copy_ampl 
    9393        $(MAKE_ALL_AMPL) 
    9494        $(MAKE_ALL_HSL) 
     
    112112MAINTAINERCLEANFILES = Makefile.in 
    113113 
    114 ampl_headers: 
     114copy_ampl: 
    115115        @if [ -d ampl ]; then\ 
    116116            mkdir -p ../include/ampl;\ 
    117117            cp ampl/*h ../include/ampl;\ 
     118            mkdir ../lib;\ 
     119            cp ampl/amplsolver.a ../lib/libamplsolver.a;\ 
    118120        fi 
    119121 
Note: See TracChangeset for help on using the changeset viewer.