Changeset 346


Ignore:
Timestamp:
Nov 12, 2009 12:27:49 AM (10 years ago)
Author:
bjarni
Message:

Add CoinProblem?.c CoinResult?.c and CoinSolver?.c src/Makefile.am and run autotools/configure

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/CoinMP/Makefile.in

    r237 r346  
    202202GLPKINCDIR = @GLPKINCDIR@
    203203GLPKLIB = @GLPKLIB@
     204GLPKOBJDIR = @GLPKOBJDIR@
    204205HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    205206HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
  • trunk/CoinMP/configure

    r237 r346  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for CoinMP 1.3.
     3# Generated by GNU Autoconf 2.59 for CoinMP 1.4stable.
    44#
    55# Report bugs to <coin-discuss@list.coin-or.org>.
     
    430430PACKAGE_NAME='CoinMP'
    431431PACKAGE_TARNAME='coinmp'
    432 PACKAGE_VERSION='1.3'
    433 PACKAGE_STRING='CoinMP 1.3'
     432PACKAGE_VERSION='1.4stable'
     433PACKAGE_STRING='CoinMP 1.4stable'
    434434PACKAGE_BUGREPORT='coin-discuss@list.coin-or.org'
    435435
     
    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 COINMPSRCDIR COINMPOBJDIR COINMPDOCDIR COIN_HAS_COINMP_TRUE COIN_HAS_COINMP_FALSE 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 OSISRCDIR OSIOBJDIR OSIDOCDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE DYLPSRCDIR DYLPOBJDIR DYLPDOCDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOLSRCDIR VOLOBJDIR VOLDOCDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR SYMPHONYDOCDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_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 ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE 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 COINMPSRCDIR COINMPOBJDIR COINMPDOCDIR COIN_HAS_COINMP_TRUE COIN_HAS_COINMP_FALSE 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 OSISRCDIR OSIOBJDIR OSIDOCDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE DYLPSRCDIR DYLPOBJDIR DYLPDOCDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOLSRCDIR VOLOBJDIR VOLDOCDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR SYMPHONYDOCDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_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 GLPKOBJDIR COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    10021002  # This message is too long to be a string in the A/UX 3.1 sh.
    10031003  cat <<_ACEOF
    1004 \`configure' configures CoinMP 1.3 to adapt to many kinds of systems.
     1004\`configure' configures CoinMP 1.4stable to adapt to many kinds of systems.
    10051005
    10061006Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10681068if test -n "$ac_init_help"; then
    10691069  case $ac_init_help in
    1070      short | recursive ) echo "Configuration of CoinMP 1.3:";;
     1070     short | recursive ) echo "Configuration of CoinMP 1.4stable:";;
    10711071   esac
    10721072  cat <<\_ACEOF
     
    12611261if $ac_init_version; then
    12621262  cat <<\_ACEOF
    1263 CoinMP configure 1.3
     1263CoinMP configure 1.4stable
    12641264generated by GNU Autoconf 2.59
    12651265
     
    12811281running configure, to aid debugging if configure makes a mistake.
    12821282
    1283 It was created by CoinMP $as_me 1.3, which was
     1283It was created by CoinMP $as_me 1.4stable, which was
    12841284generated by GNU Autoconf 2.59.  Invocation command line was
    12851285
     
    17001700ADDLIBS="-lm $LIBS"
    17011701
     1702
     1703# As backup, we make sure we don't loose an FLIBS if it has been set
     1704# by the user
     1705save_FLIBS="$FLIBS"
    17021706
    17031707# Initialize the FADDLIBS variable (which is to be used with a fortran
     
    44484452# Define the identity of the package.
    44494453 PACKAGE='coinmp'
    4450  VERSION='1.3'
     4454 VERSION='1.4stable'
    44514455
    44524456
     
    57505754*-*-irix6*)
    57515755  # Find out which ABI we are using.
    5752   echo '#line 5752 "configure"' > conftest.$ac_ext
     5756  echo '#line 5756 "configure"' > conftest.$ac_ext
    57535757  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    57545758  (eval $ac_compile) 2>&5
     
    68846888
    68856889# Provide some information about the compiler.
    6886 echo "$as_me:6886:" \
     6890echo "$as_me:6890:" \
    68876891     "checking for Fortran 77 compiler version" >&5
    68886892ac_compiler=`set X $ac_compile; echo $2`
     
    79517955   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79527956   -e 's:$: $lt_compiler_flag:'`
    7953    (eval echo "\"\$as_me:7953: $lt_compile\"" >&5)
     7957   (eval echo "\"\$as_me:7957: $lt_compile\"" >&5)
    79547958   (eval "$lt_compile" 2>conftest.err)
    79557959   ac_status=$?
    79567960   cat conftest.err >&5
    7957    echo "$as_me:7957: \$? = $ac_status" >&5
     7961   echo "$as_me:7961: \$? = $ac_status" >&5
    79587962   if (exit $ac_status) && test -s "$ac_outfile"; then
    79597963     # The compiler can only warn and ignore the option if not recognized
     
    82198223   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82208224   -e 's:$: $lt_compiler_flag:'`
    8221    (eval echo "\"\$as_me:8221: $lt_compile\"" >&5)
     8225   (eval echo "\"\$as_me:8225: $lt_compile\"" >&5)
    82228226   (eval "$lt_compile" 2>conftest.err)
    82238227   ac_status=$?
    82248228   cat conftest.err >&5
    8225    echo "$as_me:8225: \$? = $ac_status" >&5
     8229   echo "$as_me:8229: \$? = $ac_status" >&5
    82268230   if (exit $ac_status) && test -s "$ac_outfile"; then
    82278231     # The compiler can only warn and ignore the option if not recognized
     
    83238327   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83248328   -e 's:$: $lt_compiler_flag:'`
    8325    (eval echo "\"\$as_me:8325: $lt_compile\"" >&5)
     8329   (eval echo "\"\$as_me:8329: $lt_compile\"" >&5)
    83268330   (eval "$lt_compile" 2>out/conftest.err)
    83278331   ac_status=$?
    83288332   cat out/conftest.err >&5
    8329    echo "$as_me:8329: \$? = $ac_status" >&5
     8333   echo "$as_me:8333: \$? = $ac_status" >&5
    83308334   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    83318335   then
     
    1066810672  lt_status=$lt_dlunknown
    1066910673  cat > conftest.$ac_ext <<EOF
    10670 #line 10670 "configure"
     10674#line 10674 "configure"
    1067110675#include "confdefs.h"
    1067210676
     
    1076810772  lt_status=$lt_dlunknown
    1076910773  cat > conftest.$ac_ext <<EOF
    10770 #line 10770 "configure"
     10774#line 10774 "configure"
    1077110775#include "confdefs.h"
    1077210776
     
    1311213116   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1311313117   -e 's:$: $lt_compiler_flag:'`
    13114    (eval echo "\"\$as_me:13114: $lt_compile\"" >&5)
     13118   (eval echo "\"\$as_me:13118: $lt_compile\"" >&5)
    1311513119   (eval "$lt_compile" 2>conftest.err)
    1311613120   ac_status=$?
    1311713121   cat conftest.err >&5
    13118    echo "$as_me:13118: \$? = $ac_status" >&5
     13122   echo "$as_me:13122: \$? = $ac_status" >&5
    1311913123   if (exit $ac_status) && test -s "$ac_outfile"; then
    1312013124     # The compiler can only warn and ignore the option if not recognized
     
    1321613220   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1321713221   -e 's:$: $lt_compiler_flag:'`
    13218    (eval echo "\"\$as_me:13218: $lt_compile\"" >&5)
     13222   (eval echo "\"\$as_me:13222: $lt_compile\"" >&5)
    1321913223   (eval "$lt_compile" 2>out/conftest.err)
    1322013224   ac_status=$?
    1322113225   cat out/conftest.err >&5
    13222    echo "$as_me:13222: \$? = $ac_status" >&5
     13226   echo "$as_me:13226: \$? = $ac_status" >&5
    1322313227   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1322413228   then
     
    1478614790   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1478714791   -e 's:$: $lt_compiler_flag:'`
    14788    (eval echo "\"\$as_me:14788: $lt_compile\"" >&5)
     14792   (eval echo "\"\$as_me:14792: $lt_compile\"" >&5)
    1478914793   (eval "$lt_compile" 2>conftest.err)
    1479014794   ac_status=$?
    1479114795   cat conftest.err >&5
    14792    echo "$as_me:14792: \$? = $ac_status" >&5
     14796   echo "$as_me:14796: \$? = $ac_status" >&5
    1479314797   if (exit $ac_status) && test -s "$ac_outfile"; then
    1479414798     # The compiler can only warn and ignore the option if not recognized
     
    1489014894   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1489114895   -e 's:$: $lt_compiler_flag:'`
    14892    (eval echo "\"\$as_me:14892: $lt_compile\"" >&5)
     14896   (eval echo "\"\$as_me:14896: $lt_compile\"" >&5)
    1489314897   (eval "$lt_compile" 2>out/conftest.err)
    1489414898   ac_status=$?
    1489514899   cat out/conftest.err >&5
    14896    echo "$as_me:14896: \$? = $ac_status" >&5
     14900   echo "$as_me:14900: \$? = $ac_status" >&5
    1489714901   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1489814902   then
     
    1709717101   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1709817102   -e 's:$: $lt_compiler_flag:'`
    17099    (eval echo "\"\$as_me:17099: $lt_compile\"" >&5)
     17103   (eval echo "\"\$as_me:17103: $lt_compile\"" >&5)
    1710017104   (eval "$lt_compile" 2>conftest.err)
    1710117105   ac_status=$?
    1710217106   cat conftest.err >&5
    17103    echo "$as_me:17103: \$? = $ac_status" >&5
     17107   echo "$as_me:17107: \$? = $ac_status" >&5
    1710417108   if (exit $ac_status) && test -s "$ac_outfile"; then
    1710517109     # The compiler can only warn and ignore the option if not recognized
     
    1736517369   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1736617370   -e 's:$: $lt_compiler_flag:'`
    17367    (eval echo "\"\$as_me:17367: $lt_compile\"" >&5)
     17371   (eval echo "\"\$as_me:17371: $lt_compile\"" >&5)
    1736817372   (eval "$lt_compile" 2>conftest.err)
    1736917373   ac_status=$?
    1737017374   cat conftest.err >&5
    17371    echo "$as_me:17371: \$? = $ac_status" >&5
     17375   echo "$as_me:17375: \$? = $ac_status" >&5
    1737217376   if (exit $ac_status) && test -s "$ac_outfile"; then
    1737317377     # The compiler can only warn and ignore the option if not recognized
     
    1746917473   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1747017474   -e 's:$: $lt_compiler_flag:'`
    17471    (eval echo "\"\$as_me:17471: $lt_compile\"" >&5)
     17475   (eval echo "\"\$as_me:17475: $lt_compile\"" >&5)
    1747217476   (eval "$lt_compile" 2>out/conftest.err)
    1747317477   ac_status=$?
    1747417478   cat out/conftest.err >&5
    17475    echo "$as_me:17475: \$? = $ac_status" >&5
     17479   echo "$as_me:17479: \$? = $ac_status" >&5
    1747617480   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1747717481   then
     
    2208122085    coin_has_glpk=true
    2208222086    glpk_libcheck=no
     22087    GLPKOBJDIR=`cd $coin_glpkobjdir; pwd`
     22088
    2208322089    { echo "$as_me:$LINENO: Using Glpk in ThirdParty/Glpk" >&5
    2208422090echo "$as_me: Using Glpk in ThirdParty/Glpk" >&6;}
     
    2290822914cat >&5 <<_CSEOF
    2290922915
    22910 This file was extended by CoinMP $as_me 1.3, which was
     22916This file was extended by CoinMP $as_me 1.4stable, which was
    2291122917generated by GNU Autoconf 2.59.  Invocation command line was
    2291222918
     
    2297122977cat >>$CONFIG_STATUS <<_ACEOF
    2297222978ac_cs_version="\\
    22973 CoinMP config.status 1.3
     22979CoinMP config.status 1.4stable
    2297422980configured by $0, generated by GNU Autoconf 2.59,
    2297522981  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
     
    2334423350s,@COIN_HAS_GLPK_TRUE@,$COIN_HAS_GLPK_TRUE,;t t
    2334523351s,@COIN_HAS_GLPK_FALSE@,$COIN_HAS_GLPK_FALSE,;t t
     23352s,@GLPKOBJDIR@,$GLPKOBJDIR,;t t
    2334623353s,@COIN_BUILD_GLPK_TRUE@,$COIN_BUILD_GLPK_TRUE,;t t
    2334723354s,@COIN_BUILD_GLPK_FALSE@,$COIN_BUILD_GLPK_FALSE,;t t
  • trunk/CoinMP/src/Makefile.am

    r199 r346  
    1919# List all source files for this library, including headers
    2020libCoinMP_la_SOURCES = \
    21         CoinMP.h \
    22         CoinMP.cpp \
     21        CoinMP.cpp CoinMP.h \
     22        CoinProblem.c CoinProblem.h \
     23        CoinResult.c CoinResult.h \
     24        CoinSolver.c CoinSolver.h \
    2325        CoinMPConfig.h
    2426
  • trunk/CoinMP/src/Makefile.in

    r200 r346  
    6565LTLIBRARIES = $(lib_LTLIBRARIES)
    6666libCoinMP_la_LIBADD =
    67 am_libCoinMP_la_OBJECTS = CoinMP.lo
     67am_libCoinMP_la_OBJECTS = CoinMP.lo CoinProblem.lo CoinResult.lo \
     68        CoinSolver.lo
    6869libCoinMP_la_OBJECTS = $(am_libCoinMP_la_OBJECTS)
    6970depcomp = $(SHELL) $(top_srcdir)/../depcomp
    7071am__depfiles_maybe = depfiles
     72COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     73        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     74LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
     75        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     76        $(AM_CFLAGS) $(CFLAGS)
     77CCLD = $(CC)
     78LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     79        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    7180CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7281        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     
    7786CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    7887        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    79 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    80         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    81 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
    82         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    83         $(AM_CFLAGS) $(CFLAGS)
    84 CCLD = $(CC)
    85 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    86         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    8788SOURCES = $(libCoinMP_la_SOURCES)
    8889DIST_SOURCES = $(libCoinMP_la_SOURCES)
     
    195196GLPKINCDIR = @GLPKINCDIR@
    196197GLPKLIB = @GLPKLIB@
     198GLPKOBJDIR = @GLPKOBJDIR@
    197199HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    198200HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    315317# List all source files for this library, including headers
    316318libCoinMP_la_SOURCES = \
    317         CoinMP.h \
    318         CoinMP.cpp \
     319        CoinMP.cpp CoinMP.h \
     320        CoinProblem.c CoinProblem.h \
     321        CoinResult.c CoinResult.h \
     322        CoinSolver.c CoinSolver.h \
    319323        CoinMPConfig.h
    320324
     
    381385
    382386.SUFFIXES:
    383 .SUFFIXES: .cpp .lo .o .obj
     387.SUFFIXES: .c .cpp .lo .o .obj
    384388$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
    385389        @for dep in $?; do \
     
    448452
    449453@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinMP.Plo@am__quote@
     454@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinProblem.Plo@am__quote@
     455@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinResult.Plo@am__quote@
     456@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolver.Plo@am__quote@
     457
     458.c.o:
     459@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     460@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     461@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     462@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     463@am__fastdepCC_FALSE@   $(COMPILE) -c $<
     464
     465.c.obj:
     466@am__fastdepCC_TRUE@    if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
     467@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     468@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     469@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     470@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
     471
     472.c.lo:
     473@am__fastdepCC_TRUE@    if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     474@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     475@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     476@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     477@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
    450478
    451479.cpp.o:
  • trunk/CoinMP/test/Makefile.in

    r158 r346  
    288288GLPKINCDIR = @GLPKINCDIR@
    289289GLPKLIB = @GLPKLIB@
     290GLPKOBJDIR = @GLPKOBJDIR@
    290291HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    291292HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
  • trunk/configure

    r198 r346  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for CoinMP 1.3.
     4# Generated by GNU Autoconf 2.59 for CoinMP 1.4stable.
    55#
    66# Report bugs to <coin-discuss@list.coin-or.org>.
     
    277277PACKAGE_NAME='CoinMP'
    278278PACKAGE_TARNAME='coinmp'
    279 PACKAGE_VERSION='1.3'
    280 PACKAGE_STRING='CoinMP 1.3'
     279PACKAGE_VERSION='1.4stable'
     280PACKAGE_STRING='CoinMP 1.4stable'
    281281PACKAGE_BUGREPORT='coin-discuss@list.coin-or.org'
    282282
     
    743743  # This message is too long to be a string in the A/UX 3.1 sh.
    744744  cat <<_ACEOF
    745 \`configure' configures CoinMP 1.3 to adapt to many kinds of systems.
     745\`configure' configures CoinMP 1.4stable to adapt to many kinds of systems.
    746746
    747747Usage: $0 [OPTION]... [VAR=VALUE]...
     
    805805if test -n "$ac_init_help"; then
    806806  case $ac_init_help in
    807      short | recursive ) echo "Configuration of CoinMP 1.3:";;
     807     short | recursive ) echo "Configuration of CoinMP 1.4stable:";;
    808808   esac
    809809  cat <<\_ACEOF
     
    919919if $ac_init_version; then
    920920  cat <<\_ACEOF
    921 CoinMP configure 1.3
     921CoinMP configure 1.4stable
    922922generated by GNU Autoconf 2.59
    923923
     
    939939running configure, to aid debugging if configure makes a mistake.
    940940
    941 It was created by CoinMP $as_me 1.3, which was
     941It was created by CoinMP $as_me 1.4stable, which was
    942942generated by GNU Autoconf 2.59.  Invocation command line was
    943943
     
    16211621# Define the identity of the package.
    16221622 PACKAGE='coinmp'
    1623  VERSION='1.3'
     1623 VERSION='1.4stable'
    16241624
    16251625
     
    28992899cat >&5 <<_CSEOF
    29002900
    2901 This file was extended by CoinMP $as_me 1.3, which was
     2901This file was extended by CoinMP $as_me 1.4stable, which was
    29022902generated by GNU Autoconf 2.59.  Invocation command line was
    29032903
     
    29542954cat >>$CONFIG_STATUS <<_ACEOF
    29552955ac_cs_version="\\
    2956 CoinMP config.status 1.3
     2956CoinMP config.status 1.4stable
    29572957configured by $0, generated by GNU Autoconf 2.59,
    29582958  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Note: See TracChangeset for help on using the changeset viewer.