Changeset 603


Ignore:
Timestamp:
Feb 5, 2008 12:25:53 AM (14 years ago)
Author:
tkr
Message:

Changing installation location for addlibs.txt file

Location:
trunk/Cgl
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cgl/Makefile.am

    r598 r603  
    5555
    5656addlibsfile = cgl_addlibs.txt
     57addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
    5758
    5859install-exec-local: install-doc
    59         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
     60        $(install_sh_DATA) $(addlibsfile) $(addlibsdir)/$(addlibsfile)
    6061
    6162uninstall-local: uninstall-doc
  • trunk/Cgl/Makefile.in

    r598 r603  
    2121# Author:  Andreas Waechter           IBM    2006-04-13
    2222
    23 # Copyright (C) 2006 International Business Machines and others.
     23# Copyright (C) 2006, 2007 International Business Machines and others.
    2424# All Rights Reserved.
    2525# This file is distributed under the Common Public License.
     
    116116AWK = @AWK@
    117117BUILDTOOLSDIR = @BUILDTOOLSDIR@
     118CBCDOCDIR = @CBCDOCDIR@
    118119CBCOBJDIR = @CBCOBJDIR@
    119120CBCSRCDIR = @CBCSRCDIR@
     
    122123CDEFS = @CDEFS@
    123124CFLAGS = @CFLAGS@
     125CGLDOCDIR = @CGLDOCDIR@
    124126CGLOBJDIR = @CGLOBJDIR@
    125127CGLSRCDIR = @CGLSRCDIR@
    126128CGL_SUBDIRS = @CGL_SUBDIRS@
    127129CGL_SUBLIBS = @CGL_SUBLIBS@
     130CLPDOCDIR = @CLPDOCDIR@
    128131CLPOBJDIR = @CLPOBJDIR@
    129132CLPSRCDIR = @CLPSRCDIR@
     133COINUTILSDOCDIR = @COINUTILSDOCDIR@
    130134COINUTILSOBJDIR = @COINUTILSOBJDIR@
    131135COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    176180DEFS = @DEFS@
    177181DEPDIR = @DEPDIR@
     182DYLPDOCDIR = @DYLPDOCDIR@
    178183DYLPOBJDIR = @DYLPOBJDIR@
    179184DYLPSRCDIR = @DYLPSRCDIR@
     
    217222OPT_CFLAGS = @OPT_CFLAGS@
    218223OPT_CXXFLAGS = @OPT_CXXFLAGS@
     224OSIDOCDIR = @OSIDOCDIR@
    219225OSIOBJDIR = @OSIOBJDIR@
    220226OSISRCDIR = @OSISRCDIR@
     
    235241SPXLIB = @SPXLIB@
    236242STRIP = @STRIP@
     243SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    237244SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    238245SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    239246VERSION = @VERSION@
     247VOLDOCDIR = @VOLDOCDIR@
    240248VOLOBJDIR = @VOLOBJDIR@
    241249VOLSRCDIR = @VOLSRCDIR@
     
    315323########################################################################
    316324addlibsfile = cgl_addlibs.txt
     325addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
    317326
    318327########################################################################
     
    323332DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
    324333DocFiles = README AUTHORS LICENSE
    325 DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
     334DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
    326335all: all-recursive
    327336
     
    784793
    785794install-exec-local: install-doc
    786         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
     795        $(install_sh_DATA) $(addlibsfile) $(addlibsdir)/$(addlibsfile)
    787796
    788797uninstall-local: uninstall-doc
    789798        rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
    790799
    791 install-doc:
     800install-doc: $(DocFiles)
    792801        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    793802        for file in $(DocFiles); do \
  • trunk/Cgl/configure

    r598 r603  
    473473#endif"
    474474
    475 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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX 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 CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_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 ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS 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 SYMPHONYSRCDIR SYMPHONYOBJDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE CGL_SUBDIRS CGL_SUBLIBS LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
     475ac_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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX 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 CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_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 ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS CBCSRCDIR CBCOBJDIR CBCDOCDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR CGLDOCDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR CLPDOCDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR DYLPDOCDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR OSIDOCDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR SYMPHONYDOCDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE VOLSRCDIR VOLOBJDIR VOLDOCDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE CGL_SUBDIRS CGL_SUBLIBS LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    10791079  --enable-doscompile     Under Cygwin, compile so that executables run under
    10801080                          DOS. Set to mingw to use gcc/g++/ld with
    1081                           -mno-cygwin. Set to msvc to use cl/link. Default
    1082                           when mentioned: mingw. Default when not mentioned:
    1083                           disabled.
     1081                          -mno-cygwin. Set to msvc to use cl/link (or
     1082                          icl/link). Default when mentioned: mingw. Default
     1083                          when not mentioned: disabled.
    10841084  --enable-static[=PKGS]
    10851085                          build static libraries [default=no]
     
    18851885if test x"$CXX" != x; then
    18861886  case "$CXX" in
    1887     cl* | */cl* | CL* | */CL*)
     1887    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    18881888      if test x"$CC" = x; then
    18891889        CC="$CXX"
     
    19121912  *-cygwin* | *-mingw*)
    19131913             if test "$enable_doscompile" = msvc ; then
    1914                comps="cl"
     1914               comps="icl cl"
    19151915             else
    19161916               comps="gcc cl"
     
    27982798            coin_dbg_cflags='-MTd'
    27992799            ;;
     2800          icl* | */icl* | ICL* | */ICL*)
     2801            coin_opt_cflags='-MT -Ox'
     2802            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
     2803            coin_dbg_cflags='-MTd -debug'
     2804            ;;
    28002805        esac
    28012806        ;;
     
    31043109# Correct ADDLIBS initialization if we are using the MS compiler
    31053110case "$CC" in
    3106   cl* | */cl* | CL* | */CL*)
     3111  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    31073112    ADDLIBS=
    31083113    case $build in
     
    31533158  *-cygwin* | *-mingw*)
    31543159             if test "$enable_doscompile" = msvc ; then
    3155                comps="cl"
     3160               comps="icl cl"
    31563161             else
    31573162               comps="g++ cl"
     
    35303535# It seems that we need to cleanup something here for the Windows
    35313536case "$CXX" in
    3532   cl* | */cl* | CL* | */CL* )
     3537  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    35333538    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
    35343539    mv confdefs.hh confdefs.h
     
    36383643            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    36393644            coin_dbg_cxxflags='-MTd'
     3645            ;;
     3646          icl* | */icl* | ICL* | */ICL*)
     3647            # The MT and MTd options are mutually exclusive
     3648            coin_opt_cxxflags='-MT -Ox'
     3649            coin_add_cxxflags='-nologo -EHsc -GR -D_CRT_SECURE_NO_DEPRECATE'
     3650            coin_dbg_cxxflags='-MTd -debug'
    36403651            ;;
    36413652        esac
     
    57095720*-*-irix6*)
    57105721  # Find out which ABI we are using.
    5711   echo '#line 5711 "configure"' > conftest.$ac_ext
     5722  echo '#line 5722 "configure"' > conftest.$ac_ext
    57125723  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    57135724  (eval $ac_compile) 2>&5
     
    68436854
    68446855# Provide some information about the compiler.
    6845 echo "$as_me:6845:" \
     6856echo "$as_me:6856:" \
    68466857     "checking for Fortran 77 compiler version" >&5
    68476858ac_compiler=`set X $ac_compile; echo $2`
     
    79107921   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79117922   -e 's:$: $lt_compiler_flag:'`
    7912    (eval echo "\"\$as_me:7912: $lt_compile\"" >&5)
     7923   (eval echo "\"\$as_me:7923: $lt_compile\"" >&5)
    79137924   (eval "$lt_compile" 2>conftest.err)
    79147925   ac_status=$?
    79157926   cat conftest.err >&5
    7916    echo "$as_me:7916: \$? = $ac_status" >&5
     7927   echo "$as_me:7927: \$? = $ac_status" >&5
    79177928   if (exit $ac_status) && test -s "$ac_outfile"; then
    79187929     # The compiler can only warn and ignore the option if not recognized
     
    81788189   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81798190   -e 's:$: $lt_compiler_flag:'`
    8180    (eval echo "\"\$as_me:8180: $lt_compile\"" >&5)
     8191   (eval echo "\"\$as_me:8191: $lt_compile\"" >&5)
    81818192   (eval "$lt_compile" 2>conftest.err)
    81828193   ac_status=$?
    81838194   cat conftest.err >&5
    8184    echo "$as_me:8184: \$? = $ac_status" >&5
     8195   echo "$as_me:8195: \$? = $ac_status" >&5
    81858196   if (exit $ac_status) && test -s "$ac_outfile"; then
    81868197     # The compiler can only warn and ignore the option if not recognized
     
    82828293   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82838294   -e 's:$: $lt_compiler_flag:'`
    8284    (eval echo "\"\$as_me:8284: $lt_compile\"" >&5)
     8295   (eval echo "\"\$as_me:8295: $lt_compile\"" >&5)
    82858296   (eval "$lt_compile" 2>out/conftest.err)
    82868297   ac_status=$?
    82878298   cat out/conftest.err >&5
    8288    echo "$as_me:8288: \$? = $ac_status" >&5
     8299   echo "$as_me:8299: \$? = $ac_status" >&5
    82898300   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82908301   then
     
    1062710638  lt_status=$lt_dlunknown
    1062810639  cat > conftest.$ac_ext <<EOF
    10629 #line 10629 "configure"
     10640#line 10640 "configure"
    1063010641#include "confdefs.h"
    1063110642
     
    1072710738  lt_status=$lt_dlunknown
    1072810739  cat > conftest.$ac_ext <<EOF
    10729 #line 10729 "configure"
     10740#line 10740 "configure"
    1073010741#include "confdefs.h"
    1073110742
     
    1307113082   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1307213083   -e 's:$: $lt_compiler_flag:'`
    13073    (eval echo "\"\$as_me:13073: $lt_compile\"" >&5)
     13084   (eval echo "\"\$as_me:13084: $lt_compile\"" >&5)
    1307413085   (eval "$lt_compile" 2>conftest.err)
    1307513086   ac_status=$?
    1307613087   cat conftest.err >&5
    13077    echo "$as_me:13077: \$? = $ac_status" >&5
     13088   echo "$as_me:13088: \$? = $ac_status" >&5
    1307813089   if (exit $ac_status) && test -s "$ac_outfile"; then
    1307913090     # The compiler can only warn and ignore the option if not recognized
     
    1317513186   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1317613187   -e 's:$: $lt_compiler_flag:'`
    13177    (eval echo "\"\$as_me:13177: $lt_compile\"" >&5)
     13188   (eval echo "\"\$as_me:13188: $lt_compile\"" >&5)
    1317813189   (eval "$lt_compile" 2>out/conftest.err)
    1317913190   ac_status=$?
    1318013191   cat out/conftest.err >&5
    13181    echo "$as_me:13181: \$? = $ac_status" >&5
     13192   echo "$as_me:13192: \$? = $ac_status" >&5
    1318213193   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1318313194   then
     
    1474514756   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1474614757   -e 's:$: $lt_compiler_flag:'`
    14747    (eval echo "\"\$as_me:14747: $lt_compile\"" >&5)
     14758   (eval echo "\"\$as_me:14758: $lt_compile\"" >&5)
    1474814759   (eval "$lt_compile" 2>conftest.err)
    1474914760   ac_status=$?
    1475014761   cat conftest.err >&5
    14751    echo "$as_me:14751: \$? = $ac_status" >&5
     14762   echo "$as_me:14762: \$? = $ac_status" >&5
    1475214763   if (exit $ac_status) && test -s "$ac_outfile"; then
    1475314764     # The compiler can only warn and ignore the option if not recognized
     
    1484914860   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1485014861   -e 's:$: $lt_compiler_flag:'`
    14851    (eval echo "\"\$as_me:14851: $lt_compile\"" >&5)
     14862   (eval echo "\"\$as_me:14862: $lt_compile\"" >&5)
    1485214863   (eval "$lt_compile" 2>out/conftest.err)
    1485314864   ac_status=$?
    1485414865   cat out/conftest.err >&5
    14855    echo "$as_me:14855: \$? = $ac_status" >&5
     14866   echo "$as_me:14866: \$? = $ac_status" >&5
    1485614867   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1485714868   then
     
    1705617067   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1705717068   -e 's:$: $lt_compiler_flag:'`
    17058    (eval echo "\"\$as_me:17058: $lt_compile\"" >&5)
     17069   (eval echo "\"\$as_me:17069: $lt_compile\"" >&5)
    1705917070   (eval "$lt_compile" 2>conftest.err)
    1706017071   ac_status=$?
    1706117072   cat conftest.err >&5
    17062    echo "$as_me:17062: \$? = $ac_status" >&5
     17073   echo "$as_me:17073: \$? = $ac_status" >&5
    1706317074   if (exit $ac_status) && test -s "$ac_outfile"; then
    1706417075     # The compiler can only warn and ignore the option if not recognized
     
    1732417335   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1732517336   -e 's:$: $lt_compiler_flag:'`
    17326    (eval echo "\"\$as_me:17326: $lt_compile\"" >&5)
     17337   (eval echo "\"\$as_me:17337: $lt_compile\"" >&5)
    1732717338   (eval "$lt_compile" 2>conftest.err)
    1732817339   ac_status=$?
    1732917340   cat conftest.err >&5
    17330    echo "$as_me:17330: \$? = $ac_status" >&5
     17341   echo "$as_me:17341: \$? = $ac_status" >&5
    1733117342   if (exit $ac_status) && test -s "$ac_outfile"; then
    1733217343     # The compiler can only warn and ignore the option if not recognized
     
    1742817439   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1742917440   -e 's:$: $lt_compiler_flag:'`
    17430    (eval echo "\"\$as_me:17430: $lt_compile\"" >&5)
     17441   (eval echo "\"\$as_me:17441: $lt_compile\"" >&5)
    1743117442   (eval "$lt_compile" 2>out/conftest.err)
    1743217443   ac_status=$?
    1743317444   cat out/conftest.err >&5
    17434    echo "$as_me:17434: \$? = $ac_status" >&5
     17445   echo "$as_me:17445: \$? = $ac_status" >&5
    1743517446   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1743617447   then
     
    2016820179    *-cygwin* | *-mingw*)
    2016920180       case "$CXX" in
    20170     cl* | */cl* | CL* | */CL*)
     20181    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2017120182      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    2017220183echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     
    2035920370
    2036020371  CBCOBJDIR=`pwd`/$coin_has_cbc
     20372
     20373  CBCDOCDIR=$abs_lib_dir/../share/doc/coin/Cbc
    2036120374fi
    2036220375
     
    2041520428
    2041620429  CGLOBJDIR=`pwd`/$coin_has_cgl
     20430
     20431  CGLDOCDIR=$abs_lib_dir/../share/doc/coin/Cgl
    2041720432fi
    2041820433
     
    2047120486
    2047220487  CLPOBJDIR=`pwd`/$coin_has_clp
     20488
     20489  CLPDOCDIR=$abs_lib_dir/../share/doc/coin/Clp
    2047320490fi
    2047420491
     
    2052720544
    2052820545  COINUTILSOBJDIR=`pwd`/$coin_has_coinutils
     20546
     20547  COINUTILSDOCDIR=$abs_lib_dir/../share/doc/coin/CoinUtils
    2052920548fi
    2053020549
     
    2058320602
    2058420603  DYLPOBJDIR=`pwd`/$coin_has_dylp
     20604
     20605  DYLPDOCDIR=$abs_lib_dir/../share/doc/coin/DyLP
    2058520606fi
    2058620607
     
    2063920660
    2064020661  OSIOBJDIR=`pwd`/$coin_has_osi
     20662
     20663  OSIDOCDIR=$abs_lib_dir/../share/doc/coin/Osi
    2064120664fi
    2064220665
     
    2069520718
    2069620719  SYMPHONYOBJDIR=`pwd`/$coin_has_symphony
     20720
     20721  SYMPHONYDOCDIR=$abs_lib_dir/../share/doc/coin/SYMPHONY
    2069720722fi
    2069820723
     
    2075120776
    2075220777  VOLOBJDIR=`pwd`/$coin_has_vol
     20778
     20779  VOLDOCDIR=$abs_lib_dir/../share/doc/coin/Vol
    2075320780fi
    2075420781
     
    2204322070fi
    2204422071case "$CC" in
    22045   cl* | */cl* | CL* | */CL*)
     22072  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2204622073    coin_link_input_cmd=cp ;;
    2204722074esac
     
    2206122088
    2206222089  case "$CC" in
    22063     cl* | */cl* | CL* | */CL*)
     22090    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2206422091         LIBEXT=lib ;;
    2206522092      *) LIBEXT=a ;;
     
    2299523022s,@CBCSRCDIR@,$CBCSRCDIR,;t t
    2299623023s,@CBCOBJDIR@,$CBCOBJDIR,;t t
     23024s,@CBCDOCDIR@,$CBCDOCDIR,;t t
    2299723025s,@COIN_HAS_CBC_TRUE@,$COIN_HAS_CBC_TRUE,;t t
    2299823026s,@COIN_HAS_CBC_FALSE@,$COIN_HAS_CBC_FALSE,;t t
    2299923027s,@CGLSRCDIR@,$CGLSRCDIR,;t t
    2300023028s,@CGLOBJDIR@,$CGLOBJDIR,;t t
     23029s,@CGLDOCDIR@,$CGLDOCDIR,;t t
    2300123030s,@COIN_HAS_CGL_TRUE@,$COIN_HAS_CGL_TRUE,;t t
    2300223031s,@COIN_HAS_CGL_FALSE@,$COIN_HAS_CGL_FALSE,;t t
    2300323032s,@CLPSRCDIR@,$CLPSRCDIR,;t t
    2300423033s,@CLPOBJDIR@,$CLPOBJDIR,;t t
     23034s,@CLPDOCDIR@,$CLPDOCDIR,;t t
    2300523035s,@COIN_HAS_CLP_TRUE@,$COIN_HAS_CLP_TRUE,;t t
    2300623036s,@COIN_HAS_CLP_FALSE@,$COIN_HAS_CLP_FALSE,;t t
    2300723037s,@COINUTILSSRCDIR@,$COINUTILSSRCDIR,;t t
    2300823038s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
     23039s,@COINUTILSDOCDIR@,$COINUTILSDOCDIR,;t t
    2300923040s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
    2301023041s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
    2301123042s,@DYLPSRCDIR@,$DYLPSRCDIR,;t t
    2301223043s,@DYLPOBJDIR@,$DYLPOBJDIR,;t t
     23044s,@DYLPDOCDIR@,$DYLPDOCDIR,;t t
    2301323045s,@COIN_HAS_DYLP_TRUE@,$COIN_HAS_DYLP_TRUE,;t t
    2301423046s,@COIN_HAS_DYLP_FALSE@,$COIN_HAS_DYLP_FALSE,;t t
    2301523047s,@OSISRCDIR@,$OSISRCDIR,;t t
    2301623048s,@OSIOBJDIR@,$OSIOBJDIR,;t t
     23049s,@OSIDOCDIR@,$OSIDOCDIR,;t t
    2301723050s,@COIN_HAS_OSI_TRUE@,$COIN_HAS_OSI_TRUE,;t t
    2301823051s,@COIN_HAS_OSI_FALSE@,$COIN_HAS_OSI_FALSE,;t t
    2301923052s,@SYMPHONYSRCDIR@,$SYMPHONYSRCDIR,;t t
    2302023053s,@SYMPHONYOBJDIR@,$SYMPHONYOBJDIR,;t t
     23054s,@SYMPHONYDOCDIR@,$SYMPHONYDOCDIR,;t t
    2302123055s,@COIN_HAS_SYMPHONY_TRUE@,$COIN_HAS_SYMPHONY_TRUE,;t t
    2302223056s,@COIN_HAS_SYMPHONY_FALSE@,$COIN_HAS_SYMPHONY_FALSE,;t t
    2302323057s,@VOLSRCDIR@,$VOLSRCDIR,;t t
    2302423058s,@VOLOBJDIR@,$VOLOBJDIR,;t t
     23059s,@VOLDOCDIR@,$VOLDOCDIR,;t t
    2302523060s,@COIN_HAS_VOL_TRUE@,$COIN_HAS_VOL_TRUE,;t t
    2302623061s,@COIN_HAS_VOL_FALSE@,$COIN_HAS_VOL_FALSE,;t t
  • trunk/Cgl/examples/Makefile.in

    r598 r603  
    5656LIBS = -L$(COINLIBDIR) -lCgl -lOsiClp -lOsi -lClp -lCoinUtils \
    5757        @ADDLIBS@ \
    58         `cat $(COINLIBDIR)/osi_addlibs.txt` \
    59         `cat $(COINLIBDIR)/clp_addlibs.txt` \
    60         `cat $(COINLIBDIR)/coinutils_addlibs.txt`
     58        `cat @OSIDOCDIR@/osi_addlibs.txt` \
     59        `cat @CLPDOCDIR@/clp_addlibs.txt` \
     60        `cat @COINUTILSDOCDIR@/coinutils_addlibs.txt`
    6161
    6262# Necessary Include dirs (we use the CYGPATH_W variables to allow
  • trunk/Cgl/src/CglAllDifferent/Makefile.in

    r598 r603  
    107107AWK = @AWK@
    108108BUILDTOOLSDIR = @BUILDTOOLSDIR@
     109CBCDOCDIR = @CBCDOCDIR@
    109110CBCOBJDIR = @CBCOBJDIR@
    110111CBCSRCDIR = @CBCSRCDIR@
     
    113114CDEFS = @CDEFS@
    114115CFLAGS = @CFLAGS@
     116CGLDOCDIR = @CGLDOCDIR@
    115117CGLOBJDIR = @CGLOBJDIR@
    116118CGLSRCDIR = @CGLSRCDIR@
    117119CGL_SUBDIRS = @CGL_SUBDIRS@
    118120CGL_SUBLIBS = @CGL_SUBLIBS@
     121CLPDOCDIR = @CLPDOCDIR@
    119122CLPOBJDIR = @CLPOBJDIR@
    120123CLPSRCDIR = @CLPSRCDIR@
     124COINUTILSDOCDIR = @COINUTILSDOCDIR@
    121125COINUTILSOBJDIR = @COINUTILSOBJDIR@
    122126COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    167171DEFS = @DEFS@
    168172DEPDIR = @DEPDIR@
     173DYLPDOCDIR = @DYLPDOCDIR@
    169174DYLPOBJDIR = @DYLPOBJDIR@
    170175DYLPSRCDIR = @DYLPSRCDIR@
     
    208213OPT_CFLAGS = @OPT_CFLAGS@
    209214OPT_CXXFLAGS = @OPT_CXXFLAGS@
     215OSIDOCDIR = @OSIDOCDIR@
    210216OSIOBJDIR = @OSIOBJDIR@
    211217OSISRCDIR = @OSISRCDIR@
     
    226232SPXLIB = @SPXLIB@
    227233STRIP = @STRIP@
     234SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    228235SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    229236SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    230237VERSION = @VERSION@
     238VOLDOCDIR = @VOLDOCDIR@
    231239VOLOBJDIR = @VOLOBJDIR@
    232240VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglClique/Makefile.in

    r598 r603  
    108108AWK = @AWK@
    109109BUILDTOOLSDIR = @BUILDTOOLSDIR@
     110CBCDOCDIR = @CBCDOCDIR@
    110111CBCOBJDIR = @CBCOBJDIR@
    111112CBCSRCDIR = @CBCSRCDIR@
     
    114115CDEFS = @CDEFS@
    115116CFLAGS = @CFLAGS@
     117CGLDOCDIR = @CGLDOCDIR@
    116118CGLOBJDIR = @CGLOBJDIR@
    117119CGLSRCDIR = @CGLSRCDIR@
    118120CGL_SUBDIRS = @CGL_SUBDIRS@
    119121CGL_SUBLIBS = @CGL_SUBLIBS@
     122CLPDOCDIR = @CLPDOCDIR@
    120123CLPOBJDIR = @CLPOBJDIR@
    121124CLPSRCDIR = @CLPSRCDIR@
     125COINUTILSDOCDIR = @COINUTILSDOCDIR@
    122126COINUTILSOBJDIR = @COINUTILSOBJDIR@
    123127COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    168172DEFS = @DEFS@
    169173DEPDIR = @DEPDIR@
     174DYLPDOCDIR = @DYLPDOCDIR@
    170175DYLPOBJDIR = @DYLPOBJDIR@
    171176DYLPSRCDIR = @DYLPSRCDIR@
     
    209214OPT_CFLAGS = @OPT_CFLAGS@
    210215OPT_CXXFLAGS = @OPT_CXXFLAGS@
     216OSIDOCDIR = @OSIDOCDIR@
    211217OSIOBJDIR = @OSIOBJDIR@
    212218OSISRCDIR = @OSISRCDIR@
     
    227233SPXLIB = @SPXLIB@
    228234STRIP = @STRIP@
     235SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    229236SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    230237SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    231238VERSION = @VERSION@
     239VOLDOCDIR = @VOLDOCDIR@
    232240VOLOBJDIR = @VOLOBJDIR@
    233241VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglDuplicateRow/Makefile.in

    r598 r603  
    107107AWK = @AWK@
    108108BUILDTOOLSDIR = @BUILDTOOLSDIR@
     109CBCDOCDIR = @CBCDOCDIR@
    109110CBCOBJDIR = @CBCOBJDIR@
    110111CBCSRCDIR = @CBCSRCDIR@
     
    113114CDEFS = @CDEFS@
    114115CFLAGS = @CFLAGS@
     116CGLDOCDIR = @CGLDOCDIR@
    115117CGLOBJDIR = @CGLOBJDIR@
    116118CGLSRCDIR = @CGLSRCDIR@
    117119CGL_SUBDIRS = @CGL_SUBDIRS@
    118120CGL_SUBLIBS = @CGL_SUBLIBS@
     121CLPDOCDIR = @CLPDOCDIR@
    119122CLPOBJDIR = @CLPOBJDIR@
    120123CLPSRCDIR = @CLPSRCDIR@
     124COINUTILSDOCDIR = @COINUTILSDOCDIR@
    121125COINUTILSOBJDIR = @COINUTILSOBJDIR@
    122126COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    167171DEFS = @DEFS@
    168172DEPDIR = @DEPDIR@
     173DYLPDOCDIR = @DYLPDOCDIR@
    169174DYLPOBJDIR = @DYLPOBJDIR@
    170175DYLPSRCDIR = @DYLPSRCDIR@
     
    208213OPT_CFLAGS = @OPT_CFLAGS@
    209214OPT_CXXFLAGS = @OPT_CXXFLAGS@
     215OSIDOCDIR = @OSIDOCDIR@
    210216OSIOBJDIR = @OSIOBJDIR@
    211217OSISRCDIR = @OSISRCDIR@
     
    226232SPXLIB = @SPXLIB@
    227233STRIP = @STRIP@
     234SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    228235SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    229236SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    230237VERSION = @VERSION@
     238VOLDOCDIR = @VOLDOCDIR@
    231239VOLOBJDIR = @VOLOBJDIR@
    232240VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglFlowCover/Makefile.in

    r598 r603  
    107107AWK = @AWK@
    108108BUILDTOOLSDIR = @BUILDTOOLSDIR@
     109CBCDOCDIR = @CBCDOCDIR@
    109110CBCOBJDIR = @CBCOBJDIR@
    110111CBCSRCDIR = @CBCSRCDIR@
     
    113114CDEFS = @CDEFS@
    114115CFLAGS = @CFLAGS@
     116CGLDOCDIR = @CGLDOCDIR@
    115117CGLOBJDIR = @CGLOBJDIR@
    116118CGLSRCDIR = @CGLSRCDIR@
    117119CGL_SUBDIRS = @CGL_SUBDIRS@
    118120CGL_SUBLIBS = @CGL_SUBLIBS@
     121CLPDOCDIR = @CLPDOCDIR@
    119122CLPOBJDIR = @CLPOBJDIR@
    120123CLPSRCDIR = @CLPSRCDIR@
     124COINUTILSDOCDIR = @COINUTILSDOCDIR@
    121125COINUTILSOBJDIR = @COINUTILSOBJDIR@
    122126COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    167171DEFS = @DEFS@
    168172DEPDIR = @DEPDIR@
     173DYLPDOCDIR = @DYLPDOCDIR@
    169174DYLPOBJDIR = @DYLPOBJDIR@
    170175DYLPSRCDIR = @DYLPSRCDIR@
     
    208213OPT_CFLAGS = @OPT_CFLAGS@
    209214OPT_CXXFLAGS = @OPT_CXXFLAGS@
     215OSIDOCDIR = @OSIDOCDIR@
    210216OSIOBJDIR = @OSIOBJDIR@
    211217OSISRCDIR = @OSISRCDIR@
     
    226232SPXLIB = @SPXLIB@
    227233STRIP = @STRIP@
     234SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    228235SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    229236SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    230237VERSION = @VERSION@
     238VOLDOCDIR = @VOLDOCDIR@
    231239VOLOBJDIR = @VOLOBJDIR@
    232240VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglGomory/Makefile.in

    r598 r603  
    107107AWK = @AWK@
    108108BUILDTOOLSDIR = @BUILDTOOLSDIR@
     109CBCDOCDIR = @CBCDOCDIR@
    109110CBCOBJDIR = @CBCOBJDIR@
    110111CBCSRCDIR = @CBCSRCDIR@
     
    113114CDEFS = @CDEFS@
    114115CFLAGS = @CFLAGS@
     116CGLDOCDIR = @CGLDOCDIR@
    115117CGLOBJDIR = @CGLOBJDIR@
    116118CGLSRCDIR = @CGLSRCDIR@
    117119CGL_SUBDIRS = @CGL_SUBDIRS@
    118120CGL_SUBLIBS = @CGL_SUBLIBS@
     121CLPDOCDIR = @CLPDOCDIR@
    119122CLPOBJDIR = @CLPOBJDIR@
    120123CLPSRCDIR = @CLPSRCDIR@
     124COINUTILSDOCDIR = @COINUTILSDOCDIR@
    121125COINUTILSOBJDIR = @COINUTILSOBJDIR@
    122126COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    167171DEFS = @DEFS@
    168172DEPDIR = @DEPDIR@
     173DYLPDOCDIR = @DYLPDOCDIR@
    169174DYLPOBJDIR = @DYLPOBJDIR@
    170175DYLPSRCDIR = @DYLPSRCDIR@
     
    208213OPT_CFLAGS = @OPT_CFLAGS@
    209214OPT_CXXFLAGS = @OPT_CXXFLAGS@
     215OSIDOCDIR = @OSIDOCDIR@
    210216OSIOBJDIR = @OSIOBJDIR@
    211217OSISRCDIR = @OSISRCDIR@
     
    226232SPXLIB = @SPXLIB@
    227233STRIP = @STRIP@
     234SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    228235SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    229236SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    230237VERSION = @VERSION@
     238VOLDOCDIR = @VOLDOCDIR@
    231239VOLOBJDIR = @VOLOBJDIR@
    232240VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglKnapsackCover/Makefile.in

    r598 r603  
    108108AWK = @AWK@
    109109BUILDTOOLSDIR = @BUILDTOOLSDIR@
     110CBCDOCDIR = @CBCDOCDIR@
    110111CBCOBJDIR = @CBCOBJDIR@
    111112CBCSRCDIR = @CBCSRCDIR@
     
    114115CDEFS = @CDEFS@
    115116CFLAGS = @CFLAGS@
     117CGLDOCDIR = @CGLDOCDIR@
    116118CGLOBJDIR = @CGLOBJDIR@
    117119CGLSRCDIR = @CGLSRCDIR@
    118120CGL_SUBDIRS = @CGL_SUBDIRS@
    119121CGL_SUBLIBS = @CGL_SUBLIBS@
     122CLPDOCDIR = @CLPDOCDIR@
    120123CLPOBJDIR = @CLPOBJDIR@
    121124CLPSRCDIR = @CLPSRCDIR@
     125COINUTILSDOCDIR = @COINUTILSDOCDIR@
    122126COINUTILSOBJDIR = @COINUTILSOBJDIR@
    123127COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    168172DEFS = @DEFS@
    169173DEPDIR = @DEPDIR@
     174DYLPDOCDIR = @DYLPDOCDIR@
    170175DYLPOBJDIR = @DYLPOBJDIR@
    171176DYLPSRCDIR = @DYLPSRCDIR@
     
    209214OPT_CFLAGS = @OPT_CFLAGS@
    210215OPT_CXXFLAGS = @OPT_CXXFLAGS@
     216OSIDOCDIR = @OSIDOCDIR@
    211217OSIOBJDIR = @OSIOBJDIR@
    212218OSISRCDIR = @OSISRCDIR@
     
    227233SPXLIB = @SPXLIB@
    228234STRIP = @STRIP@
     235SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    229236SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    230237SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    231238VERSION = @VERSION@
     239VOLDOCDIR = @VOLDOCDIR@
    232240VOLOBJDIR = @VOLOBJDIR@
    233241VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglLandP/Makefile.in

    r598 r603  
    108108AWK = @AWK@
    109109BUILDTOOLSDIR = @BUILDTOOLSDIR@
     110CBCDOCDIR = @CBCDOCDIR@
    110111CBCOBJDIR = @CBCOBJDIR@
    111112CBCSRCDIR = @CBCSRCDIR@
     
    114115CDEFS = @CDEFS@
    115116CFLAGS = @CFLAGS@
     117CGLDOCDIR = @CGLDOCDIR@
    116118CGLOBJDIR = @CGLOBJDIR@
    117119CGLSRCDIR = @CGLSRCDIR@
    118120CGL_SUBDIRS = @CGL_SUBDIRS@
    119121CGL_SUBLIBS = @CGL_SUBLIBS@
     122CLPDOCDIR = @CLPDOCDIR@
    120123CLPOBJDIR = @CLPOBJDIR@
    121124CLPSRCDIR = @CLPSRCDIR@
     125COINUTILSDOCDIR = @COINUTILSDOCDIR@
    122126COINUTILSOBJDIR = @COINUTILSOBJDIR@
    123127COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    168172DEFS = @DEFS@
    169173DEPDIR = @DEPDIR@
     174DYLPDOCDIR = @DYLPDOCDIR@
    170175DYLPOBJDIR = @DYLPOBJDIR@
    171176DYLPSRCDIR = @DYLPSRCDIR@
     
    209214OPT_CFLAGS = @OPT_CFLAGS@
    210215OPT_CXXFLAGS = @OPT_CXXFLAGS@
     216OSIDOCDIR = @OSIDOCDIR@
    211217OSIOBJDIR = @OSIOBJDIR@
    212218OSISRCDIR = @OSISRCDIR@
     
    227233SPXLIB = @SPXLIB@
    228234STRIP = @STRIP@
     235SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    229236SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    230237SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    231238VERSION = @VERSION@
     239VOLDOCDIR = @VOLDOCDIR@
    232240VOLOBJDIR = @VOLOBJDIR@
    233241VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglLiftAndProject/Makefile.in

    r598 r603  
    108108AWK = @AWK@
    109109BUILDTOOLSDIR = @BUILDTOOLSDIR@
     110CBCDOCDIR = @CBCDOCDIR@
    110111CBCOBJDIR = @CBCOBJDIR@
    111112CBCSRCDIR = @CBCSRCDIR@
     
    114115CDEFS = @CDEFS@
    115116CFLAGS = @CFLAGS@
     117CGLDOCDIR = @CGLDOCDIR@
    116118CGLOBJDIR = @CGLOBJDIR@
    117119CGLSRCDIR = @CGLSRCDIR@
    118120CGL_SUBDIRS = @CGL_SUBDIRS@
    119121CGL_SUBLIBS = @CGL_SUBLIBS@
     122CLPDOCDIR = @CLPDOCDIR@
    120123CLPOBJDIR = @CLPOBJDIR@
    121124CLPSRCDIR = @CLPSRCDIR@
     125COINUTILSDOCDIR = @COINUTILSDOCDIR@
    122126COINUTILSOBJDIR = @COINUTILSOBJDIR@
    123127COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    168172DEFS = @DEFS@
    169173DEPDIR = @DEPDIR@
     174DYLPDOCDIR = @DYLPDOCDIR@
    170175DYLPOBJDIR = @DYLPOBJDIR@
    171176DYLPSRCDIR = @DYLPSRCDIR@
     
    209214OPT_CFLAGS = @OPT_CFLAGS@
    210215OPT_CXXFLAGS = @OPT_CXXFLAGS@
     216OSIDOCDIR = @OSIDOCDIR@
    211217OSIOBJDIR = @OSIOBJDIR@
    212218OSISRCDIR = @OSISRCDIR@
     
    227233SPXLIB = @SPXLIB@
    228234STRIP = @STRIP@
     235SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    229236SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    230237SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    231238VERSION = @VERSION@
     239VOLDOCDIR = @VOLDOCDIR@
    232240VOLOBJDIR = @VOLOBJDIR@
    233241VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglMixedIntegerRounding/Makefile.in

    r598 r603  
    109109AWK = @AWK@
    110110BUILDTOOLSDIR = @BUILDTOOLSDIR@
     111CBCDOCDIR = @CBCDOCDIR@
    111112CBCOBJDIR = @CBCOBJDIR@
    112113CBCSRCDIR = @CBCSRCDIR@
     
    115116CDEFS = @CDEFS@
    116117CFLAGS = @CFLAGS@
     118CGLDOCDIR = @CGLDOCDIR@
    117119CGLOBJDIR = @CGLOBJDIR@
    118120CGLSRCDIR = @CGLSRCDIR@
    119121CGL_SUBDIRS = @CGL_SUBDIRS@
    120122CGL_SUBLIBS = @CGL_SUBLIBS@
     123CLPDOCDIR = @CLPDOCDIR@
    121124CLPOBJDIR = @CLPOBJDIR@
    122125CLPSRCDIR = @CLPSRCDIR@
     126COINUTILSDOCDIR = @COINUTILSDOCDIR@
    123127COINUTILSOBJDIR = @COINUTILSOBJDIR@
    124128COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    169173DEFS = @DEFS@
    170174DEPDIR = @DEPDIR@
     175DYLPDOCDIR = @DYLPDOCDIR@
    171176DYLPOBJDIR = @DYLPOBJDIR@
    172177DYLPSRCDIR = @DYLPSRCDIR@
     
    210215OPT_CFLAGS = @OPT_CFLAGS@
    211216OPT_CXXFLAGS = @OPT_CXXFLAGS@
     217OSIDOCDIR = @OSIDOCDIR@
    212218OSIOBJDIR = @OSIOBJDIR@
    213219OSISRCDIR = @OSISRCDIR@
     
    228234SPXLIB = @SPXLIB@
    229235STRIP = @STRIP@
     236SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    230237SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    231238SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    232239VERSION = @VERSION@
     240VOLDOCDIR = @VOLDOCDIR@
    233241VOLOBJDIR = @VOLOBJDIR@
    234242VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglMixedIntegerRounding2/Makefile.in

    r598 r603  
    109109AWK = @AWK@
    110110BUILDTOOLSDIR = @BUILDTOOLSDIR@
     111CBCDOCDIR = @CBCDOCDIR@
    111112CBCOBJDIR = @CBCOBJDIR@
    112113CBCSRCDIR = @CBCSRCDIR@
     
    115116CDEFS = @CDEFS@
    116117CFLAGS = @CFLAGS@
     118CGLDOCDIR = @CGLDOCDIR@
    117119CGLOBJDIR = @CGLOBJDIR@
    118120CGLSRCDIR = @CGLSRCDIR@
    119121CGL_SUBDIRS = @CGL_SUBDIRS@
    120122CGL_SUBLIBS = @CGL_SUBLIBS@
     123CLPDOCDIR = @CLPDOCDIR@
    121124CLPOBJDIR = @CLPOBJDIR@
    122125CLPSRCDIR = @CLPSRCDIR@
     126COINUTILSDOCDIR = @COINUTILSDOCDIR@
    123127COINUTILSOBJDIR = @COINUTILSOBJDIR@
    124128COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    169173DEFS = @DEFS@
    170174DEPDIR = @DEPDIR@
     175DYLPDOCDIR = @DYLPDOCDIR@
    171176DYLPOBJDIR = @DYLPOBJDIR@
    172177DYLPSRCDIR = @DYLPSRCDIR@
     
    210215OPT_CFLAGS = @OPT_CFLAGS@
    211216OPT_CXXFLAGS = @OPT_CXXFLAGS@
     217OSIDOCDIR = @OSIDOCDIR@
    212218OSIOBJDIR = @OSIOBJDIR@
    213219OSISRCDIR = @OSISRCDIR@
     
    228234SPXLIB = @SPXLIB@
    229235STRIP = @STRIP@
     236SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    230237SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    231238SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    232239VERSION = @VERSION@
     240VOLDOCDIR = @VOLDOCDIR@
    233241VOLOBJDIR = @VOLOBJDIR@
    234242VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglOddHole/Makefile.in

    r598 r603  
    107107AWK = @AWK@
    108108BUILDTOOLSDIR = @BUILDTOOLSDIR@
     109CBCDOCDIR = @CBCDOCDIR@
    109110CBCOBJDIR = @CBCOBJDIR@
    110111CBCSRCDIR = @CBCSRCDIR@
     
    113114CDEFS = @CDEFS@
    114115CFLAGS = @CFLAGS@
     116CGLDOCDIR = @CGLDOCDIR@
    115117CGLOBJDIR = @CGLOBJDIR@
    116118CGLSRCDIR = @CGLSRCDIR@
    117119CGL_SUBDIRS = @CGL_SUBDIRS@
    118120CGL_SUBLIBS = @CGL_SUBLIBS@
     121CLPDOCDIR = @CLPDOCDIR@
    119122CLPOBJDIR = @CLPOBJDIR@
    120123CLPSRCDIR = @CLPSRCDIR@
     124COINUTILSDOCDIR = @COINUTILSDOCDIR@
    121125COINUTILSOBJDIR = @COINUTILSOBJDIR@
    122126COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    167171DEFS = @DEFS@
    168172DEPDIR = @DEPDIR@
     173DYLPDOCDIR = @DYLPDOCDIR@
    169174DYLPOBJDIR = @DYLPOBJDIR@
    170175DYLPSRCDIR = @DYLPSRCDIR@
     
    208213OPT_CFLAGS = @OPT_CFLAGS@
    209214OPT_CXXFLAGS = @OPT_CXXFLAGS@
     215OSIDOCDIR = @OSIDOCDIR@
    210216OSIOBJDIR = @OSIOBJDIR@
    211217OSISRCDIR = @OSISRCDIR@
     
    226232SPXLIB = @SPXLIB@
    227233STRIP = @STRIP@
     234SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    228235SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    229236SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    230237VERSION = @VERSION@
     238VOLDOCDIR = @VOLDOCDIR@
    231239VOLOBJDIR = @VOLOBJDIR@
    232240VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglPreProcess/Makefile.in

    r598 r603  
    107107AWK = @AWK@
    108108BUILDTOOLSDIR = @BUILDTOOLSDIR@
     109CBCDOCDIR = @CBCDOCDIR@
    109110CBCOBJDIR = @CBCOBJDIR@
    110111CBCSRCDIR = @CBCSRCDIR@
     
    113114CDEFS = @CDEFS@
    114115CFLAGS = @CFLAGS@
     116CGLDOCDIR = @CGLDOCDIR@
    115117CGLOBJDIR = @CGLOBJDIR@
    116118CGLSRCDIR = @CGLSRCDIR@
    117119CGL_SUBDIRS = @CGL_SUBDIRS@
    118120CGL_SUBLIBS = @CGL_SUBLIBS@
     121CLPDOCDIR = @CLPDOCDIR@
    119122CLPOBJDIR = @CLPOBJDIR@
    120123CLPSRCDIR = @CLPSRCDIR@
     124COINUTILSDOCDIR = @COINUTILSDOCDIR@
    121125COINUTILSOBJDIR = @COINUTILSOBJDIR@
    122126COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    167171DEFS = @DEFS@
    168172DEPDIR = @DEPDIR@
     173DYLPDOCDIR = @DYLPDOCDIR@
    169174DYLPOBJDIR = @DYLPOBJDIR@
    170175DYLPSRCDIR = @DYLPSRCDIR@
     
    208213OPT_CFLAGS = @OPT_CFLAGS@
    209214OPT_CXXFLAGS = @OPT_CXXFLAGS@
     215OSIDOCDIR = @OSIDOCDIR@
    210216OSIOBJDIR = @OSIOBJDIR@
    211217OSISRCDIR = @OSISRCDIR@
     
    226232SPXLIB = @SPXLIB@
    227233STRIP = @STRIP@
     234SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    228235SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    229236SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    230237VERSION = @VERSION@
     238VOLDOCDIR = @VOLDOCDIR@
    231239VOLOBJDIR = @VOLOBJDIR@
    232240VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglProbing/Makefile.in

    r598 r603  
    107107AWK = @AWK@
    108108BUILDTOOLSDIR = @BUILDTOOLSDIR@
     109CBCDOCDIR = @CBCDOCDIR@
    109110CBCOBJDIR = @CBCOBJDIR@
    110111CBCSRCDIR = @CBCSRCDIR@
     
    113114CDEFS = @CDEFS@
    114115CFLAGS = @CFLAGS@
     116CGLDOCDIR = @CGLDOCDIR@
    115117CGLOBJDIR = @CGLOBJDIR@
    116118CGLSRCDIR = @CGLSRCDIR@
    117119CGL_SUBDIRS = @CGL_SUBDIRS@
    118120CGL_SUBLIBS = @CGL_SUBLIBS@
     121CLPDOCDIR = @CLPDOCDIR@
    119122CLPOBJDIR = @CLPOBJDIR@
    120123CLPSRCDIR = @CLPSRCDIR@
     124COINUTILSDOCDIR = @COINUTILSDOCDIR@
    121125COINUTILSOBJDIR = @COINUTILSOBJDIR@
    122126COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    167171DEFS = @DEFS@
    168172DEPDIR = @DEPDIR@
     173DYLPDOCDIR = @DYLPDOCDIR@
    169174DYLPOBJDIR = @DYLPOBJDIR@
    170175DYLPSRCDIR = @DYLPSRCDIR@
     
    208213OPT_CFLAGS = @OPT_CFLAGS@
    209214OPT_CXXFLAGS = @OPT_CXXFLAGS@
     215OSIDOCDIR = @OSIDOCDIR@
    210216OSIOBJDIR = @OSIOBJDIR@
    211217OSISRCDIR = @OSISRCDIR@
     
    226232SPXLIB = @SPXLIB@
    227233STRIP = @STRIP@
     234SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    228235SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    229236SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    230237VERSION = @VERSION@
     238VOLDOCDIR = @VOLDOCDIR@
    231239VOLOBJDIR = @VOLOBJDIR@
    232240VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglRedSplit/Makefile.in

    r598 r603  
    108108AWK = @AWK@
    109109BUILDTOOLSDIR = @BUILDTOOLSDIR@
     110CBCDOCDIR = @CBCDOCDIR@
    110111CBCOBJDIR = @CBCOBJDIR@
    111112CBCSRCDIR = @CBCSRCDIR@
     
    114115CDEFS = @CDEFS@
    115116CFLAGS = @CFLAGS@
     117CGLDOCDIR = @CGLDOCDIR@
    116118CGLOBJDIR = @CGLOBJDIR@
    117119CGLSRCDIR = @CGLSRCDIR@
    118120CGL_SUBDIRS = @CGL_SUBDIRS@
    119121CGL_SUBLIBS = @CGL_SUBLIBS@
     122CLPDOCDIR = @CLPDOCDIR@
    120123CLPOBJDIR = @CLPOBJDIR@
    121124CLPSRCDIR = @CLPSRCDIR@
     125COINUTILSDOCDIR = @COINUTILSDOCDIR@
    122126COINUTILSOBJDIR = @COINUTILSOBJDIR@
    123127COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    168172DEFS = @DEFS@
    169173DEPDIR = @DEPDIR@
     174DYLPDOCDIR = @DYLPDOCDIR@
    170175DYLPOBJDIR = @DYLPOBJDIR@
    171176DYLPSRCDIR = @DYLPSRCDIR@
     
    209214OPT_CFLAGS = @OPT_CFLAGS@
    210215OPT_CXXFLAGS = @OPT_CXXFLAGS@
     216OSIDOCDIR = @OSIDOCDIR@
    211217OSIOBJDIR = @OSIOBJDIR@
    212218OSISRCDIR = @OSISRCDIR@
     
    227233SPXLIB = @SPXLIB@
    228234STRIP = @STRIP@
     235SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    229236SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    230237SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    231238VERSION = @VERSION@
     239VOLDOCDIR = @VOLDOCDIR@
    232240VOLOBJDIR = @VOLOBJDIR@
    233241VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglResidualCapacity/Makefile.in

    r598 r603  
    109109AWK = @AWK@
    110110BUILDTOOLSDIR = @BUILDTOOLSDIR@
     111CBCDOCDIR = @CBCDOCDIR@
    111112CBCOBJDIR = @CBCOBJDIR@
    112113CBCSRCDIR = @CBCSRCDIR@
     
    115116CDEFS = @CDEFS@
    116117CFLAGS = @CFLAGS@
     118CGLDOCDIR = @CGLDOCDIR@
    117119CGLOBJDIR = @CGLOBJDIR@
    118120CGLSRCDIR = @CGLSRCDIR@
    119121CGL_SUBDIRS = @CGL_SUBDIRS@
    120122CGL_SUBLIBS = @CGL_SUBLIBS@
     123CLPDOCDIR = @CLPDOCDIR@
    121124CLPOBJDIR = @CLPOBJDIR@
    122125CLPSRCDIR = @CLPSRCDIR@
     126COINUTILSDOCDIR = @COINUTILSDOCDIR@
    123127COINUTILSOBJDIR = @COINUTILSOBJDIR@
    124128COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    169173DEFS = @DEFS@
    170174DEPDIR = @DEPDIR@
     175DYLPDOCDIR = @DYLPDOCDIR@
    171176DYLPOBJDIR = @DYLPOBJDIR@
    172177DYLPSRCDIR = @DYLPSRCDIR@
     
    210215OPT_CFLAGS = @OPT_CFLAGS@
    211216OPT_CXXFLAGS = @OPT_CXXFLAGS@
     217OSIDOCDIR = @OSIDOCDIR@
    212218OSIOBJDIR = @OSIOBJDIR@
    213219OSISRCDIR = @OSISRCDIR@
     
    228234SPXLIB = @SPXLIB@
    229235STRIP = @STRIP@
     236SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    230237SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    231238SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    232239VERSION = @VERSION@
     240VOLDOCDIR = @VOLDOCDIR@
    233241VOLOBJDIR = @VOLOBJDIR@
    234242VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglSimpleRounding/Makefile.in

    r598 r603  
    109109AWK = @AWK@
    110110BUILDTOOLSDIR = @BUILDTOOLSDIR@
     111CBCDOCDIR = @CBCDOCDIR@
    111112CBCOBJDIR = @CBCOBJDIR@
    112113CBCSRCDIR = @CBCSRCDIR@
     
    115116CDEFS = @CDEFS@
    116117CFLAGS = @CFLAGS@
     118CGLDOCDIR = @CGLDOCDIR@
    117119CGLOBJDIR = @CGLOBJDIR@
    118120CGLSRCDIR = @CGLSRCDIR@
    119121CGL_SUBDIRS = @CGL_SUBDIRS@
    120122CGL_SUBLIBS = @CGL_SUBLIBS@
     123CLPDOCDIR = @CLPDOCDIR@
    121124CLPOBJDIR = @CLPOBJDIR@
    122125CLPSRCDIR = @CLPSRCDIR@
     126COINUTILSDOCDIR = @COINUTILSDOCDIR@
    123127COINUTILSOBJDIR = @COINUTILSOBJDIR@
    124128COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    169173DEFS = @DEFS@
    170174DEPDIR = @DEPDIR@
     175DYLPDOCDIR = @DYLPDOCDIR@
    171176DYLPOBJDIR = @DYLPOBJDIR@
    172177DYLPSRCDIR = @DYLPSRCDIR@
     
    210215OPT_CFLAGS = @OPT_CFLAGS@
    211216OPT_CXXFLAGS = @OPT_CXXFLAGS@
     217OSIDOCDIR = @OSIDOCDIR@
    212218OSIOBJDIR = @OSIOBJDIR@
    213219OSISRCDIR = @OSISRCDIR@
     
    228234SPXLIB = @SPXLIB@
    229235STRIP = @STRIP@
     236SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    230237SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    231238SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    232239VERSION = @VERSION@
     240VOLDOCDIR = @VOLDOCDIR@
    233241VOLOBJDIR = @VOLOBJDIR@
    234242VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/CglTwomir/Makefile.in

    r598 r603  
    107107AWK = @AWK@
    108108BUILDTOOLSDIR = @BUILDTOOLSDIR@
     109CBCDOCDIR = @CBCDOCDIR@
    109110CBCOBJDIR = @CBCOBJDIR@
    110111CBCSRCDIR = @CBCSRCDIR@
     
    113114CDEFS = @CDEFS@
    114115CFLAGS = @CFLAGS@
     116CGLDOCDIR = @CGLDOCDIR@
    115117CGLOBJDIR = @CGLOBJDIR@
    116118CGLSRCDIR = @CGLSRCDIR@
    117119CGL_SUBDIRS = @CGL_SUBDIRS@
    118120CGL_SUBLIBS = @CGL_SUBLIBS@
     121CLPDOCDIR = @CLPDOCDIR@
    119122CLPOBJDIR = @CLPOBJDIR@
    120123CLPSRCDIR = @CLPSRCDIR@
     124COINUTILSDOCDIR = @COINUTILSDOCDIR@
    121125COINUTILSOBJDIR = @COINUTILSOBJDIR@
    122126COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    167171DEFS = @DEFS@
    168172DEPDIR = @DEPDIR@
     173DYLPDOCDIR = @DYLPDOCDIR@
    169174DYLPOBJDIR = @DYLPOBJDIR@
    170175DYLPSRCDIR = @DYLPSRCDIR@
     
    208213OPT_CFLAGS = @OPT_CFLAGS@
    209214OPT_CXXFLAGS = @OPT_CXXFLAGS@
     215OSIDOCDIR = @OSIDOCDIR@
    210216OSIOBJDIR = @OSIOBJDIR@
    211217OSISRCDIR = @OSISRCDIR@
     
    226232SPXLIB = @SPXLIB@
    227233STRIP = @STRIP@
     234SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    228235SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    229236SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    230237VERSION = @VERSION@
     238VOLDOCDIR = @VOLDOCDIR@
    231239VOLOBJDIR = @VOLOBJDIR@
    232240VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/src/Makefile.in

    r598 r603  
    116116AWK = @AWK@
    117117BUILDTOOLSDIR = @BUILDTOOLSDIR@
     118CBCDOCDIR = @CBCDOCDIR@
    118119CBCOBJDIR = @CBCOBJDIR@
    119120CBCSRCDIR = @CBCSRCDIR@
     
    122123CDEFS = @CDEFS@
    123124CFLAGS = @CFLAGS@
     125CGLDOCDIR = @CGLDOCDIR@
    124126CGLOBJDIR = @CGLOBJDIR@
    125127CGLSRCDIR = @CGLSRCDIR@
    126128CGL_SUBDIRS = @CGL_SUBDIRS@
    127129CGL_SUBLIBS = @CGL_SUBLIBS@
     130CLPDOCDIR = @CLPDOCDIR@
    128131CLPOBJDIR = @CLPOBJDIR@
    129132CLPSRCDIR = @CLPSRCDIR@
     133COINUTILSDOCDIR = @COINUTILSDOCDIR@
    130134COINUTILSOBJDIR = @COINUTILSOBJDIR@
    131135COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    176180DEFS = @DEFS@
    177181DEPDIR = @DEPDIR@
     182DYLPDOCDIR = @DYLPDOCDIR@
    178183DYLPOBJDIR = @DYLPOBJDIR@
    179184DYLPSRCDIR = @DYLPSRCDIR@
     
    217222OPT_CFLAGS = @OPT_CFLAGS@
    218223OPT_CXXFLAGS = @OPT_CXXFLAGS@
     224OSIDOCDIR = @OSIDOCDIR@
    219225OSIOBJDIR = @OSIOBJDIR@
    220226OSISRCDIR = @OSISRCDIR@
     
    235241SPXLIB = @SPXLIB@
    236242STRIP = @STRIP@
     243SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    237244SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    238245SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    239246VERSION = @VERSION@
     247VOLDOCDIR = @VOLDOCDIR@
    240248VOLOBJDIR = @VOLOBJDIR@
    241249VOLSRCDIR = @VOLSRCDIR@
  • trunk/Cgl/test/Makefile.am

    r520 r603  
    5858  unitTest_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    5959        $(CLPOBJDIR)/src/libClp.la
    60   LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     60  LIBS  += `cat $(CLPDOCDIR)/clp_addlibs.txt`
    6161endif
    6262
     
    6666  unitTest_LDADD += $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    6767        $(CBCOBJDIR)/src/libCbc.la
    68   LIBS += `cat $(CBCOBJDIR)/cbc_addlibs.txt`
     68  LIBS += `cat $(CBCDOCDIR)/cbc_addlibs.txt`
    6969endif
    7070
     
    7272  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    7373        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    74   unitTest_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     74  unitTest_LDADD += $(OSIDOCDIR)/src/OsiCpx/libOsiCpx.la
    7575endif
    7676
     
    8282  unitTest_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    8383        $(DYLPOBJDIR)/src/Dylp/libDylp.la
    84   LIBS += `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
     84  LIBS += `cat $(DYLPDOCDIR)/dylp_addlibs.txt`
    8585endif
    8686
     
    119119  unitTest_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    120120        $(SYMPHONYOBJDIR)/src/libSym.la
    121   LIBS += `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
     121  LIBS += `cat $(SYMPHONYDOCDIR)/sym_addlibs.txt`
    122122endif
    123123
     
    127127  unitTest_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    128128        $(VOLOBJDIR)/src/libVol.la
    129   LIBS += `cat $(VOLOBJDIR)/vol_addlibs.txt`
     129  LIBS += `cat $(VOLDOCDIR)/vol_addlibs.txt`
    130130endif
    131131
     
    142142
    143143# List additional libraries
    144 LIBS += `cat $(OSIOBJDIR)/osi_addlibs.txt`\
    145         `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` \
     144LIBS += `cat $(OSIDOCDIR)/osi_addlibs.txt`\
     145        `cat $(COINUTILSDOCDIR)/coinutils_addlibs.txt` \
    146146        $(ADDLIBS)
    147147
  • trunk/Cgl/test/Makefile.in

    r590 r603  
    5757@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    5858
    59 @COIN_HAS_CLP_TRUE@am__append_3 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
     59@COIN_HAS_CLP_TRUE@am__append_3 = `cat $(CLPDOCDIR)/clp_addlibs.txt`
    6060@COIN_HAS_CBC_TRUE@am__append_4 = -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    6161@COIN_HAS_CBC_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
     
    6464@COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbc.la
    6565
    66 @COIN_HAS_CBC_TRUE@am__append_6 = `cat $(CBCOBJDIR)/cbc_addlibs.txt`
     66@COIN_HAS_CBC_TRUE@am__append_6 = `cat $(CBCDOCDIR)/cbc_addlibs.txt`
    6767@COIN_HAS_CPX_TRUE@am__append_7 = -I`$(CYGPATH_W) $(CPXINCDIR)` \
    6868@COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    6969
    70 @COIN_HAS_CPX_TRUE@am__append_8 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     70@COIN_HAS_CPX_TRUE@am__append_8 = $(OSIDOCDIR)/src/OsiCpx/libOsiCpx.la
    7171@COIN_HAS_DYLP_TRUE@am__append_9 = -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    7272@COIN_HAS_DYLP_TRUE@    -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
     
    7777@COIN_HAS_DYLP_TRUE@    $(DYLPOBJDIR)/src/Dylp/libDylp.la
    7878
    79 @COIN_HAS_DYLP_TRUE@am__append_11 = `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
     79@COIN_HAS_DYLP_TRUE@am__append_11 = `cat $(DYLPDOCDIR)/dylp_addlibs.txt`
    8080@COIN_HAS_FMP_TRUE@am__append_12 = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    8181@COIN_HAS_FMP_TRUE@am__append_13 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     
    102102@COIN_HAS_SYMPHONY_TRUE@        $(SYMPHONYOBJDIR)/src/libSym.la
    103103
    104 @COIN_HAS_SYMPHONY_TRUE@am__append_24 = `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
     104@COIN_HAS_SYMPHONY_TRUE@am__append_24 = `cat $(SYMPHONYDOCDIR)/sym_addlibs.txt`
    105105@COIN_HAS_VOL_TRUE@am__append_25 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    106106@COIN_HAS_VOL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
     
    109109@COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    110110
    111 @COIN_HAS_VOL_TRUE@am__append_27 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
     111@COIN_HAS_VOL_TRUE@am__append_27 = `cat $(VOLDOCDIR)/vol_addlibs.txt`
    112112@COIN_HAS_XPR_TRUE@am__append_28 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
    113113@COIN_HAS_XPR_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
     
    134134@COIN_HAS_CBC_TRUE@     $(CBCOBJDIR)/src/libCbc.la
    135135@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_3 =  \
    136 @COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     136@COIN_HAS_CPX_TRUE@     $(OSIDOCDIR)/src/OsiCpx/libOsiCpx.la
    137137@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_4 =  \
    138138@COIN_HAS_DYLP_TRUE@    $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     
    195195AWK = @AWK@
    196196BUILDTOOLSDIR = @BUILDTOOLSDIR@
     197CBCDOCDIR = @CBCDOCDIR@
    197198CBCOBJDIR = @CBCOBJDIR@
    198199CBCSRCDIR = @CBCSRCDIR@
     
    201202CDEFS = @CDEFS@
    202203CFLAGS = @CFLAGS@
     204CGLDOCDIR = @CGLDOCDIR@
    203205CGLOBJDIR = @CGLOBJDIR@
    204206CGLSRCDIR = @CGLSRCDIR@
    205207CGL_SUBDIRS = @CGL_SUBDIRS@
    206208CGL_SUBLIBS = @CGL_SUBLIBS@
     209CLPDOCDIR = @CLPDOCDIR@
    207210CLPOBJDIR = @CLPOBJDIR@
    208211CLPSRCDIR = @CLPSRCDIR@
     212COINUTILSDOCDIR = @COINUTILSDOCDIR@
    209213COINUTILSOBJDIR = @COINUTILSOBJDIR@
    210214COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    255259DEFS = @DEFS@
    256260DEPDIR = @DEPDIR@
     261DYLPDOCDIR = @DYLPDOCDIR@
    257262DYLPOBJDIR = @DYLPOBJDIR@
    258263DYLPSRCDIR = @DYLPSRCDIR@
     
    283288LIBS = @LIBS@ $(am__append_3) $(am__append_6) $(am__append_11) \
    284289        $(am__append_24) $(am__append_27) `cat \
    285         $(OSIOBJDIR)/osi_addlibs.txt` `cat \
    286         $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
     290        $(OSIDOCDIR)/osi_addlibs.txt` `cat \
     291        $(COINUTILSDOCDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    287292LIBTOOL = @LIBTOOL@
    288293LIBTOOLM4 = @LIBTOOLM4@
     
    301306OPT_CFLAGS = @OPT_CFLAGS@
    302307OPT_CXXFLAGS = @OPT_CXXFLAGS@
     308OSIDOCDIR = @OSIDOCDIR@
    303309OSIOBJDIR = @OSIOBJDIR@
    304310OSISRCDIR = @OSISRCDIR@
     
    319325SPXLIB = @SPXLIB@
    320326STRIP = @STRIP@
     327SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    321328SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    322329SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    323330VERSION = @VERSION@
     331VOLDOCDIR = @VOLDOCDIR@
    324332VOLOBJDIR = @VOLOBJDIR@
    325333VOLSRCDIR = @VOLSRCDIR@
Note: See TracChangeset for help on using the changeset viewer.