Changeset 714


Ignore:
Timestamp:
07/02/06 23:05:14 (8 years ago)
Author:
wehart
Message:

Rework to eliminate references to pico-core and pico-milp.

( Links to Acro-related mail archives at  http://software.sandia.gov/Acro/ )

Location:
acro/trunk/bootstrap
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • acro/trunk/bootstrap/packages/Makefile.am

    r640 r714  
    1717SUBDIRS = tpl \ 
    1818  $(UTILIB_DIR) $(EXACT_DIR) $(TRACECACHE_DIR) $(APPSPACK_DIR) \ 
    19   $(COLIN_DIR) $(TMF_DIR) $(PICOCORE_DIR) $(PICOMILP_DIR) \ 
    20   $(COLINY_DIR) $(PARPCX_DIR) $(GNLP_DIR) 
     19  $(COLIN_DIR) $(TMF_DIR) $(PEBBL_DIR) $(PICO_DIR) \ 
     20  $(COLINY_DIR) $(PARPCX_DIR) $(GNLP_DIR) $(OPTPP_DIR) 
    2121 
    2222DIST_SUBDIRS = tpl \ 
    2323  $(UTILIB_DIR) $(EXACT_DIR) $(TRACECACHE_DIR) $(APPSPACK_DIR) \ 
    24   $(COLIN_DIR) $(TMF_DIR) $(PICOCORE_DIR) $(PICOMILP_DIR) \ 
    25   $(COLINY_DIR) $(PARPCX_DIR) $(GNLP_DIR) 
     24  $(COLIN_DIR) $(TMF_DIR) $(PEBBL_DIR) $(PICO_DIR) \ 
     25  $(COLINY_DIR) $(PARPCX_DIR) $(GNLP_DIR) $(OPTPP_DIR) 
    2626 
     27if BUILD_OPTPP 
     28   MAKE_OPTPP_DOC=cd optpp && $(MAKE) docs 
     29endif 
    2730if BUILD_UTILIB 
    2831   MAKE_UTILIB_DOC=cd utilib && $(MAKE) docs 
     
    3740   MAKE_COLINY_DOC=cd coliny/doc && $(MAKE) docs 
    3841endif 
    39 if BUILD_PICOCORE 
    40    MAKE_PICOCORE_DOC=cd pebbl/doc && $(MAKE) docs 
     42if BUILD_PEBBL 
     43   MAKE_PEBBL_DOC=cd pebbl/doc && $(MAKE) docs 
    4144endif 
    42 if BUILD_PICOMILP 
    43    MAKE_PICOMILP_DOC=cd pico/doc && $(MAKE) docs 
     45if BUILD_PICO 
     46   MAKE_PICO_DOC=cd pico/doc && $(MAKE) docs 
    4447endif 
    4548if BUILD_PARPCX 
     
    6568        $(MAKE_GNLP_DOC) 
    6669        $(MAKE_PARPCX_DOC) 
    67         $(MAKE_PICOCORE_DOC) 
    68         $(MAKE_PICOMILP_DOC) 
     70        $(MAKE_PEBBL_DOC) 
     71        $(MAKE_PICO_DOC) 
     72        $(MAKE_OPTPP_DOC) 
    6973 
    7074DISTCLEANFILES= dummy/Makefile dummy/Makefile.in 
  • acro/trunk/bootstrap/root/configure.ac

    r658 r714  
    141141  coliny_warn="coliny will be built without blas or lapack, because these require fortran" 
    142142  gnlp_warn="gnlp will be built without npsol, blas, or lapack, because they require fortran" 
    143   pico_milp_warn="pico will be built without blas or lapack, because they require fortran" 
     143  pico_warn="pico will be built without blas or lapack, because they require fortran" 
    144144  # 
    145145  # appspack has 1 fortran source file, but it looks like it is never built 
     
    539539fi 
    540540 
     541# OPT++ 
     542ACRO_ARG_WITH_PACKAGE(optpp, OPTPP, optpp, 
     543       ${srcdir}/packages/optpp/Makefile.am, yes) 
     544ACRO_ARG_ENABLE_PACKAGE_RECONFIG(optpp, packages/optpp/config.status, yes) 
     545if test X${ac_cv_reconfigure_optpp} = Xyes ; then 
     546   if test -d ${srcdir}/packages/optpp ; then 
     547      AC_CONFIG_SUBDIRS([packages/optpp]) 
     548   fi 
     549fi 
     550 
    541551# parpcx 
    542552ACRO_ARG_WITH_PACKAGE(parpcx, PARPCX, parpcx, 
     
    554564 
    555565# pebbl 
    556 ACRO_ARG_WITH_PACKAGE(pico_core, PICOCORE, pebbl, 
     566ACRO_ARG_WITH_PACKAGE(pebbl, PEBBL, pebbl, 
    557567       ${srcdir}/packages/pebbl/src/bb/branching.h, yes) 
    558 if test X${ac_cv_with_pico_core} = Xyes ; then 
     568if test X${ac_cv_with_pebbl} = Xyes ; then 
    559569   if test -d ${srcdir}/packages/pebbl ; then 
    560570      AC_CONFIG_FILES([packages/pebbl/Makefile:packages/pebbl/Makefile.in:packages/dummy/Makefile.in]) 
     
    567577 
    568578# pico 
    569 AM_CONDITIONAL(PICO_MILP_TEST_DIR_COMPILES, false) 
    570 ACRO_ARG_WITH_PACKAGE(pico_milp, PICOMILP, pico, 
     579AM_CONDITIONAL(PICO_TEST_DIR_COMPILES, false) 
     580ACRO_ARG_WITH_PACKAGE(pico, PICO, pico, 
    571581       ${srcdir}/packages/pico/src/milp/parMilp.h, yes) 
    572 if test X${ac_cv_with_pico_milp} = Xyes ; then 
     582if test X${ac_cv_with_pico} = Xyes ; then 
    573583   if test -d ${srcdir}/packages/pico ; then 
    574584      AC_CONFIG_FILES([packages/pico/Makefile:packages/pico/Makefile.in:packages/dummy/Makefile.in]) 
     
    579589   fi 
    580590   if test "X${ac_cv_have_fortran}"="Xno" ; then 
    581      AC_MSG_WARN([$pico_milp_warn]) 
     591     AC_MSG_WARN([$pico_warn]) 
    582592   fi 
    583593fi 
Note: See TracChangeset for help on using the changeset viewer.