Changeset 212


Ignore:
Timestamp:
May 13, 2006 9:15:13 AM (13 years ago)
Author:
andreasw
Message:

renamed CoinBase? to CoinUtils?

Location:
trunk
Files:
44 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        22Data/Netlib   https://www.coin-or.org/svn/Data/trunk/Netlib
        33Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
        4 CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
         4CoinUtils     https://www.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        55Clp           https://www.coin-or.org/svn/Clp/trunk/Clp
        66Osi           https://www.coin-or.org/svn/Osi/trunk/Osi
  • trunk/Cgl/Makefile.in

    r208 r212  
    111111CLPOBJDIR = @CLPOBJDIR@
    112112CLPSRCDIR = @CLPSRCDIR@
    113 COINBASEOBJDIR = @COINBASEOBJDIR@
    114 COINBASESRCDIR = @COINBASESRCDIR@
     113COINUTILSOBJDIR = @COINUTILSOBJDIR@
     114COINUTILSSRCDIR = @COINUTILSSRCDIR@
    115115COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    116116COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    121121COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    122122COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    123 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    124 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     123COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     124COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    125125COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    126126COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
  • trunk/Cgl/configure

    r208 r212  
    474474#endif"
    475475
    476 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CXXDEFS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL pkg_lib_dir pkg_include_dir pkg_bin_dir CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINBASESRCDIR COINBASEOBJDIR COIN_HAS_COINBASE_TRUE COIN_HAS_COINBASE_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIBDIR COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIBDIR COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE FMPINCDIR FMPLIBDIR COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIBDIR COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIBDIR COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIBDIR COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIBDIR COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE CGL_SUBDIRS CGL_SUBLIBS LIBOBJS LTLIBOBJS'
     476ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CXXDEFS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL pkg_lib_dir pkg_include_dir pkg_bin_dir CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIBDIR COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIBDIR COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE FMPINCDIR FMPLIBDIR COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIBDIR COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIBDIR COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIBDIR COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIBDIR COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE CGL_SUBDIRS CGL_SUBLIBS LIBOBJS LTLIBOBJS'
    477477ac_subst_files=''
    478478
     
    1966119661echo "${ECHO_T}$coin_has_clp" >&6
    1966219662
    19663 echo "$as_me:$LINENO: checking for COIN project CoinBase" >&5
    19664 echo $ECHO_N "checking for COIN project CoinBase... $ECHO_C" >&6
     19663echo "$as_me:$LINENO: checking for COIN project CoinUtils" >&5
     19664echo $ECHO_N "checking for COIN project CoinUtils... $ECHO_C" >&6
    1966519665
    1966619666# First check, if the sub-project is actually available (ToDo: allow
    1966719667# other locations)
    1966819668
    19669 coin_has_coinbase=unavailable
    19670 if test $PACKAGE_TARNAME = coinbase; then
    19671   coin_has_coinbase=.
    19672 else
    19673   if test -d $srcdir/../CoinBase; then
    19674     coin_has_coinbase=../CoinBase
     19669coin_has_coinutils=unavailable
     19670if test $PACKAGE_TARNAME = coinutils; then
     19671  coin_has_coinutils=.
     19672else
     19673  if test -d $srcdir/../CoinUtils; then
     19674    coin_has_coinutils=../CoinUtils
    1967519675  fi
    1967619676fi
    1967719677
    19678 if test $coin_has_coinbase != unavailable; then
     19678if test $coin_has_coinutils != unavailable; then
    1967919679  # Set the #define if the component is available
    1968019680
    1968119681cat >>confdefs.h <<\_ACEOF
    19682 #define COIN_HAS_COINBASE 1
     19682#define COIN_HAS_COINUTILS 1
    1968319683_ACEOF
    1968419684
     
    1968619686  # Set the variables for source and object code location
    1968719687
    19688   COINBASESRCDIR=`cd $srcdir/$coin_has_coinbase; pwd`
    19689 
    19690   COINBASEOBJDIR=`pwd`/$coin_has_coinbase
     19688  COINUTILSSRCDIR=`cd $srcdir/$coin_has_coinutils; pwd`
     19689
     19690  COINUTILSOBJDIR=`pwd`/$coin_has_coinutils
    1969119691fi
    1969219692
     
    1969419694
    1969519695
    19696 if test $coin_has_coinbase != unavailable; then
    19697   COIN_HAS_COINBASE_TRUE=
    19698   COIN_HAS_COINBASE_FALSE='#'
    19699 else
    19700   COIN_HAS_COINBASE_TRUE='#'
    19701   COIN_HAS_COINBASE_FALSE=
    19702 fi
    19703 
    19704 echo "$as_me:$LINENO: result: $coin_has_coinbase" >&5
    19705 echo "${ECHO_T}$coin_has_coinbase" >&6
     19696if test $coin_has_coinutils != unavailable; then
     19697  COIN_HAS_COINUTILS_TRUE=
     19698  COIN_HAS_COINUTILS_FALSE='#'
     19699else
     19700  COIN_HAS_COINUTILS_TRUE='#'
     19701  COIN_HAS_COINUTILS_FALSE=
     19702fi
     19703
     19704echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
     19705echo "${ECHO_T}$coin_has_coinutils" >&6
    1970619706
    1970719707echo "$as_me:$LINENO: checking for COIN project Dylp" >&5
     
    2120621206   { (exit 1); exit 1; }; }
    2120721207fi
    21208 if test -z "${COIN_HAS_COINBASE_TRUE}" && test -z "${COIN_HAS_COINBASE_FALSE}"; then
    21209   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINBASE\" was never defined.
     21208if test -z "${COIN_HAS_COINUTILS_TRUE}" && test -z "${COIN_HAS_COINUTILS_FALSE}"; then
     21209  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
    2121021210Usually this means the macro was only invoked conditionally." >&5
    21211 echo "$as_me: error: conditional \"COIN_HAS_COINBASE\" was never defined.
     21211echo "$as_me: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
    2121221212Usually this means the macro was only invoked conditionally." >&2;}
    2121321213   { (exit 1); exit 1; }; }
     
    2193821938s,@COIN_HAS_CLP_TRUE@,$COIN_HAS_CLP_TRUE,;t t
    2193921939s,@COIN_HAS_CLP_FALSE@,$COIN_HAS_CLP_FALSE,;t t
    21940 s,@COINBASESRCDIR@,$COINBASESRCDIR,;t t
    21941 s,@COINBASEOBJDIR@,$COINBASEOBJDIR,;t t
    21942 s,@COIN_HAS_COINBASE_TRUE@,$COIN_HAS_COINBASE_TRUE,;t t
    21943 s,@COIN_HAS_COINBASE_FALSE@,$COIN_HAS_COINBASE_FALSE,;t t
     21940s,@COINUTILSSRCDIR@,$COINUTILSSRCDIR,;t t
     21941s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
     21942s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
     21943s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
    2194421944s,@DYLPSRCDIR@,$DYLPSRCDIR,;t t
    2194521945s,@DYLPOBJDIR@,$DYLPOBJDIR,;t t
  • trunk/Cgl/configure.ac

    r208 r212  
    6262AC_COIN_HAS_PROJECT(Cgl)
    6363AC_COIN_HAS_PROJECT(Clp)
    64 AC_COIN_HAS_PROJECT(CoinBase)
     64AC_COIN_HAS_PROJECT(CoinUtils)
    6565AC_COIN_HAS_PROJECT(Dylp)
    6666AC_COIN_HAS_PROJECT(Osi)
  • trunk/Cgl/inc/config_cgl.h.in

    r208 r212  
    1313#undef COIN_HAS_CLP
    1414
    15 /* Define to 1 if the CoinBase package is used */
    16 #undef COIN_HAS_COINBASE
     15/* Define to 1 if the CoinUtils package is used */
     16#undef COIN_HAS_COINUTILS
    1717
    1818/* Define to 1 if the Cplex package is used */
  • trunk/Cgl/src/CglAllDifferent/Makefile.am

    r208 r212  
    3030CXXFLAGS += \
    3131        -I`$(CYGPATH_W) $(srcdir)/..` \
    32         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     32        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3333        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3434
  • trunk/Cgl/src/CglAllDifferent/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    165165# being compiled.
    166166CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    167         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     167        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    168168CYGPATH_W = @CYGPATH_W@
    169169DEFS = @DEFS@
  • trunk/Cgl/src/CglClique/Makefile.am

    r208 r212  
    3131CXXFLAGS += \
    3232        -I`$(CYGPATH_W) $(srcdir)/..` \
    33         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     33        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3434        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3535
  • trunk/Cgl/src/CglClique/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    165165# being compiled.
    166166CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    167         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     167        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    168168CYGPATH_W = @CYGPATH_W@
    169169DEFS = @DEFS@
  • trunk/Cgl/src/CglDuplicateRow/Makefile.am

    r208 r212  
    3030CXXFLAGS += \
    3131        -I`$(CYGPATH_W) $(srcdir)/..` \
    32         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     32        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3333        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3434
  • trunk/Cgl/src/CglDuplicateRow/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    165165# being compiled.
    166166CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    167         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     167        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    168168CYGPATH_W = @CYGPATH_W@
    169169DEFS = @DEFS@
  • trunk/Cgl/src/CglFlowCover/Makefile.am

    r208 r212  
    3131CXXFLAGS += \
    3232        -I`$(CYGPATH_W) $(srcdir)/..` \
    33         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     33        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3434        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3535
  • trunk/Cgl/src/CglFlowCover/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    165165# being compiled.
    166166CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    167         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     167        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    168168CYGPATH_W = @CYGPATH_W@
    169169DEFS = @DEFS@
  • trunk/Cgl/src/CglGomory/Makefile.am

    r208 r212  
    3131CXXFLAGS += \
    3232        -I`$(CYGPATH_W) $(srcdir)/..` \
    33         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     33        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3434        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3535
  • trunk/Cgl/src/CglGomory/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    165165# being compiled.
    166166CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    167         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     167        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    168168CYGPATH_W = @CYGPATH_W@
    169169DEFS = @DEFS@
  • trunk/Cgl/src/CglKnapsackCover/Makefile.am

    r208 r212  
    3131CXXFLAGS += \
    3232        -I`$(CYGPATH_W) $(srcdir)/..` \
    33         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     33        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3434        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3535
  • trunk/Cgl/src/CglKnapsackCover/Makefile.in

    r208 r212  
    118118CLPOBJDIR = @CLPOBJDIR@
    119119CLPSRCDIR = @CLPSRCDIR@
    120 COINBASEOBJDIR = @COINBASEOBJDIR@
    121 COINBASESRCDIR = @COINBASESRCDIR@
     120COINUTILSOBJDIR = @COINUTILSOBJDIR@
     121COINUTILSSRCDIR = @COINUTILSSRCDIR@
    122122COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    123123COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    128128COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    129129COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    130 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    131 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     130COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     131COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    132132COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    133133COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    166166# being compiled.
    167167CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    168         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     168        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    169169CYGPATH_W = @CYGPATH_W@
    170170DEFS = @DEFS@
  • trunk/Cgl/src/CglLiftAndProject/Makefile.am

    r208 r212  
    3030CXXFLAGS += \
    3131        -I`$(CYGPATH_W) $(srcdir)/..` \
    32         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     32        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3333        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3434
  • trunk/Cgl/src/CglLiftAndProject/Makefile.in

    r208 r212  
    118118CLPOBJDIR = @CLPOBJDIR@
    119119CLPSRCDIR = @CLPSRCDIR@
    120 COINBASEOBJDIR = @COINBASEOBJDIR@
    121 COINBASESRCDIR = @COINBASESRCDIR@
     120COINUTILSOBJDIR = @COINUTILSOBJDIR@
     121COINUTILSSRCDIR = @COINUTILSSRCDIR@
    122122COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    123123COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    128128COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    129129COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    130 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    131 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     130COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     131COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    132132COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    133133COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    166166# being compiled.
    167167CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    168         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     168        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    169169CYGPATH_W = @CYGPATH_W@
    170170DEFS = @DEFS@
  • trunk/Cgl/src/CglMixedIntegerRounding/Makefile.am

    r208 r212  
    3030CXXFLAGS += \
    3131        -I`$(CYGPATH_W) $(srcdir)/..` \
    32         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     32        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3333        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3434
  • trunk/Cgl/src/CglMixedIntegerRounding/Makefile.in

    r208 r212  
    118118CLPOBJDIR = @CLPOBJDIR@
    119119CLPSRCDIR = @CLPSRCDIR@
    120 COINBASEOBJDIR = @COINBASEOBJDIR@
    121 COINBASESRCDIR = @COINBASESRCDIR@
     120COINUTILSOBJDIR = @COINUTILSOBJDIR@
     121COINUTILSSRCDIR = @COINUTILSSRCDIR@
    122122COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    123123COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    128128COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    129129COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    130 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    131 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     130COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     131COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    132132COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    133133COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    166166# being compiled.
    167167CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    168         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     168        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    169169CYGPATH_W = @CYGPATH_W@
    170170DEFS = @DEFS@
  • trunk/Cgl/src/CglMixedIntegerRounding2/Makefile.am

    r208 r212  
    3030CXXFLAGS += \
    3131        -I`$(CYGPATH_W) $(srcdir)/..` \
    32         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     32        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3333        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3434
  • trunk/Cgl/src/CglMixedIntegerRounding2/Makefile.in

    r208 r212  
    119119CLPOBJDIR = @CLPOBJDIR@
    120120CLPSRCDIR = @CLPSRCDIR@
    121 COINBASEOBJDIR = @COINBASEOBJDIR@
    122 COINBASESRCDIR = @COINBASESRCDIR@
     121COINUTILSOBJDIR = @COINUTILSOBJDIR@
     122COINUTILSSRCDIR = @COINUTILSSRCDIR@
    123123COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    124124COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    129129COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    130130COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    131 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    132 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     131COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     132COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    133133COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    134134COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    167167# being compiled.
    168168CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    169         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     169        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    170170CYGPATH_W = @CYGPATH_W@
    171171DEFS = @DEFS@
  • trunk/Cgl/src/CglOddHole/Makefile.am

    r208 r212  
    3131CXXFLAGS += \
    3232        -I`$(CYGPATH_W) $(srcdir)/..` \
    33         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     33        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3434        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3535
  • trunk/Cgl/src/CglOddHole/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    165165# being compiled.
    166166CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    167         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     167        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    168168CYGPATH_W = @CYGPATH_W@
    169169DEFS = @DEFS@
  • trunk/Cgl/src/CglPreProcess/Makefile.am

    r208 r212  
    3232        -I`$(CYGPATH_W) $(srcdir)/../CglProbing` \
    3333        -I`$(CYGPATH_W) $(srcdir)/../CglDuplicateRow` \
    34         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     34        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3535        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3636
  • trunk/Cgl/src/CglPreProcess/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    167167        $(srcdir)/../CglProbing` -I`$(CYGPATH_W) \
    168168        $(srcdir)/../CglDuplicateRow` -I`$(CYGPATH_W) \
    169         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     169        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    170170CYGPATH_W = @CYGPATH_W@
    171171DEFS = @DEFS@
  • trunk/Cgl/src/CglProbing/Makefile.am

    r208 r212  
    3131CXXFLAGS += \
    3232        -I`$(CYGPATH_W) $(srcdir)/..` \
    33         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     33        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3434        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3535
  • trunk/Cgl/src/CglProbing/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    165165# being compiled.
    166166CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    167         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     167        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    168168CYGPATH_W = @CYGPATH_W@
    169169DEFS = @DEFS@
  • trunk/Cgl/src/CglRedSplit/Makefile.am

    r208 r212  
    3030CXXFLAGS += \
    3131        -I`$(CYGPATH_W) $(srcdir)/..` \
    32         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     32        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3333        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3434
  • trunk/Cgl/src/CglRedSplit/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    165165# being compiled.
    166166CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    167         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     167        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    168168CYGPATH_W = @CYGPATH_W@
    169169DEFS = @DEFS@
  • trunk/Cgl/src/CglSimpleRounding/Makefile.am

    r208 r212  
    3131CXXFLAGS += \
    3232        -I`$(CYGPATH_W) $(srcdir)/..` \
    33         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     33        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3434        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3535
  • trunk/Cgl/src/CglSimpleRounding/Makefile.in

    r208 r212  
    119119CLPOBJDIR = @CLPOBJDIR@
    120120CLPSRCDIR = @CLPSRCDIR@
    121 COINBASEOBJDIR = @COINBASEOBJDIR@
    122 COINBASESRCDIR = @COINBASESRCDIR@
     121COINUTILSOBJDIR = @COINUTILSOBJDIR@
     122COINUTILSSRCDIR = @COINUTILSSRCDIR@
    123123COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    124124COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    129129COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    130130COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    131 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    132 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     131COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     132COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    133133COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    134134COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    167167# being compiled.
    168168CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    169         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     169        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    170170CYGPATH_W = @CYGPATH_W@
    171171DEFS = @DEFS@
  • trunk/Cgl/src/CglTwomir/Makefile.am

    r208 r212  
    3030CXXFLAGS += \
    3131        -I`$(CYGPATH_W) $(srcdir)/..` \
    32         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     32        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    3333        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    3434
  • trunk/Cgl/src/CglTwomir/Makefile.in

    r208 r212  
    117117CLPOBJDIR = @CLPOBJDIR@
    118118CLPSRCDIR = @CLPSRCDIR@
    119 COINBASEOBJDIR = @COINBASEOBJDIR@
    120 COINBASESRCDIR = @COINBASESRCDIR@
     119COINUTILSOBJDIR = @COINUTILSOBJDIR@
     120COINUTILSSRCDIR = @COINUTILSSRCDIR@
    121121COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    122122COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    127127COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    128128COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    129 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    130 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     129COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     130COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    131131COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    132132COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    165165# being compiled.
    166166CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
    167         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     167        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    168168CYGPATH_W = @CYGPATH_W@
    169169DEFS = @DEFS@
  • trunk/Cgl/src/Makefile.am

    r208 r212  
    3838# being compiled.
    3939CXXFLAGS += \
    40         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     40        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    4141        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    4242
  • trunk/Cgl/src/Makefile.in

    r208 r212  
    126126CLPOBJDIR = @CLPOBJDIR@
    127127CLPSRCDIR = @CLPSRCDIR@
    128 COINBASEOBJDIR = @COINBASEOBJDIR@
    129 COINBASESRCDIR = @COINBASESRCDIR@
     128COINUTILSOBJDIR = @COINUTILSOBJDIR@
     129COINUTILSSRCDIR = @COINUTILSSRCDIR@
    130130COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    131131COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    136136COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    137137COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    138 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    139 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     138COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     139COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    140140COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    141141COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    173173# "top_srcdir" refers to the basic directory for the main package that is
    174174# being compiled.
    175 CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     175CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    176176        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    177177CYGPATH_W = @CYGPATH_W@
  • trunk/Cgl/test/Makefile.am

    r211 r212  
    2525# Here list all include flags, relative to this "srcdir" directory.  This
    2626# "cygpath" stuff is necessary to compile with native compilers on Windows
    27 CXXFLAGS += -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     27CXXFLAGS += -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    2828        -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    2929        -I`$(CYGPATH_W) $(srcdir)/../src` \
     
    124124
    125125# Finally the Coin library (many of the above need it)
    126 unitTest_LDADD += $(COINBASEOBJDIR)/src/libCoinBase.la
    127 LIBS += `cat $(COINBASEOBJDIR)/coinbase_addlibs.txt` $(ADDLIBS)
     126unitTest_LDADD += $(COINUTILSOBJDIR)/src/libCoinUtils.la
     127LIBS += `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    128128
    129129test: unitTest
  • trunk/Cgl/test/Makefile.in

    r211 r212  
    161161        $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
    162162        $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_12) \
    163         $(COINBASEOBJDIR)/src/libCoinBase.la
     163        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    164164DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    165165depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    203203CLPOBJDIR = @CLPOBJDIR@
    204204CLPSRCDIR = @CLPSRCDIR@
    205 COINBASEOBJDIR = @COINBASEOBJDIR@
    206 COINBASESRCDIR = @COINBASESRCDIR@
     205COINUTILSOBJDIR = @COINUTILSOBJDIR@
     206COINUTILSSRCDIR = @COINUTILSSRCDIR@
    207207COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    208208COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    213213COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    214214COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    215 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    216 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     215COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     216COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    217217COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    218218COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    248248# Here list all include flags, relative to this "srcdir" directory.  This
    249249# "cygpath" stuff is necessary to compile with native compilers on Windows
    250 CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     250CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    251251        -I`$(CYGPATH_W) $(OSISRCDIR)/src` -I`$(CYGPATH_W) \
    252252        $(srcdir)/../src` -I`$(CYGPATH_W) \
     
    290290LIBS = @LIBS@ `cat $(OSIOBJDIR)/osi_addlibs.txt` $(am__append_3) \
    291291        $(am__append_6) $(am__append_11) $(am__append_24) \
    292         $(am__append_27) `cat $(COINBASEOBJDIR)/coinbase_addlibs.txt` \
    293         $(ADDLIBS)
     292        $(am__append_27) `cat \
     293        $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    294294LIBTOOL = @LIBTOOL@
    295295LIBTOOLM4 = @LIBTOOLM4@
     
    388388        $(am__append_17) $(am__append_19) $(am__append_21) \
    389389        $(am__append_23) $(am__append_26) $(am__append_29) \
    390         $(COINBASEOBJDIR)/src/libCoinBase.la
     390        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    391391
    392392########################################################################
  • trunk/Externals

    r207 r212  
    22Data/Netlib   https://www.coin-or.org/svn/Data/trunk/Netlib
    33Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
    4 CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
     4CoinUtils     https://www.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    55Clp           https://www.coin-or.org/svn/Clp/trunk/Clp
    66Osi           https://www.coin-or.org/svn/Osi/trunk/Osi
  • trunk/Makefile.am

    r207 r212  
    2323########################################################################
    2424
    25 test:
     25test: all
    2626        cd Cgl; make test
    2727
  • trunk/Makefile.in

    r208 r212  
    580580########################################################################
    581581
    582 test:
     582test: all
    583583        cd Cgl; make test
    584584
     
    626626@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    627627
     628@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     629@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
     630
    628631@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@distclean-local: clean-externals-stamp
    629632
  • trunk/configure

    r209 r212  
    283283ac_unique_file="configure.ac"
    284284ac_default_prefix=`pwd`
    285 ac_subdirs_all="$ac_subdirs_all CoinBase"
     285ac_subdirs_all="$ac_subdirs_all CoinUtils"
    286286ac_subdirs_all="$ac_subdirs_all Data/Netlib"
    287287ac_subdirs_all="$ac_subdirs_all Data/Sample"
     
    20682068
    20692069coin_subdirs=
    2070 echo "$as_me:$LINENO: checking whether directory CoinBase is available" >&5
    2071 echo $ECHO_N "checking whether directory CoinBase is available... $ECHO_C" >&6
    2072                 if test -r $srcdir/CoinBase/configure; then
    2073                   coin_subdirs="$coin_subdirs CoinBase"
     2070echo "$as_me:$LINENO: checking whether directory CoinUtils is available" >&5
     2071echo $ECHO_N "checking whether directory CoinUtils is available... $ECHO_C" >&6
     2072                if test -r $srcdir/CoinUtils/configure; then
     2073                  coin_subdirs="$coin_subdirs CoinUtils"
    20742074                  echo "$as_me:$LINENO: result: yes" >&5
    20752075echo "${ECHO_T}yes" >&6
    20762076
    20772077
    2078 subdirs="$subdirs CoinBase"
     2078subdirs="$subdirs CoinUtils"
    20792079
    20802080                else
  • trunk/configure.ac

    r209 r212  
    4444#############################################################################
    4545
    46 AC_COIN_MAIN_SUBDIRS(CoinBase)
     46AC_COIN_MAIN_SUBDIRS(CoinUtils)
    4747AC_COIN_MAIN_SUBDIRS(Data/Netlib)
    4848AC_COIN_MAIN_SUBDIRS(Data/Sample)
Note: See TracChangeset for help on using the changeset viewer.