Changeset 1527 for branches


Ignore:
Timestamp:
Feb 27, 2010 1:41:40 PM (10 years ago)
Author:
stefan
Message:

add OsiClp? including OsiClp? unittest

Location:
branches/split
Files:
9 added
9 edited

Legend:

Unmodified
Added
Removed
  • branches/split

  • branches/split/Clp/Makefile.in

    r1522 r1527  
    6666        $(srcdir)/clp_addlibs.txt.in $(top_srcdir)/configure \
    6767        $(top_srcdir)/examples/Makefile.in \
    68         $(top_srcdir)/inc/config_clp.h.in AUTHORS
     68        $(top_srcdir)/inc/config_clp.h.in \
     69        $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in AUTHORS
    6970@HAVE_EXTERNALS_TRUE@am__append_2 = Externals
    7071@HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
     
    8081CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
    8182CONFIG_CLEAN_FILES = examples/Makefile clp_addlibs.txt clp.pc \
    82         clp-uninstalled.pc
     83        clp-uninstalled.pc osi-clp-uninstalled.pc
    8384SOURCES =
    8485DIST_SOURCES =
     
    145146COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
    146147COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     148COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
     149COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     150COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
     151COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    147152COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
    148153COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
     
    195200OPT_CFLAGS = @OPT_CFLAGS@
    196201OPT_CXXFLAGS = @OPT_CXXFLAGS@
     202OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     203OSITESTS_DATA = @OSITESTS_DATA@
     204OSITESTS_LIBS = @OSITESTS_LIBS@
     205OSI_CFLAGS = @OSI_CFLAGS@
     206OSI_DATA = @OSI_DATA@
     207OSI_LIBS = @OSI_LIBS@
    197208PACKAGE = @PACKAGE@
    198209PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    376387clp-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/clp-uninstalled.pc.in
    377388        cd $(top_builddir) && $(SHELL) ./config.status $@
     389osi-clp-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in
     390        cd $(top_builddir) && $(SHELL) ./config.status $@
    378391
    379392mostlyclean-libtool:
     
    556569        $(am__remove_distdir)
    557570        mkdir $(distdir)
    558         $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc
     571        $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc $(distdir)/src/OsiClp
    559572        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    560573        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • branches/split/Clp/configure

    r1522 r1527  
    33# Generated by GNU Autoconf 2.59 for Clp trunk.
    44#
    5 # Report bugs to <coin-clp@list.coin-or.org>.
     5# Report bugs to <clp@list.coin-or.org>.
    66#
    77# Copyright (C) 2003 Free Software Foundation, Inc.
     
    432432PACKAGE_VERSION='trunk'
    433433PACKAGE_STRING='Clp trunk'
    434 PACKAGE_BUGREPORT='coin-clp@list.coin-or.org'
    435 
    436 ac_unique_file="src/ClpCholeskyBase.cpp"
     434PACKAGE_BUGREPORT='clp@list.coin-or.org'
     435
     436ac_unique_file="src/ClpSimplex.cpp"
    437437ac_default_prefix=`pwd`
    438438# Factoring default headers for most tests.
     
    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 PKG_CONFIG ac_pt_PKG_CONFIG COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR 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 PKG_CONFIG ac_pt_PKG_CONFIG COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    11171117  --with-coin-instdir     prefix of installation directory for precompiled
    11181118                          COIN packages
     1119  --with-osi-lib linker flags for using module Osi
     1120  --with-osi-incdir directory with header files for using module Osi
     1121  --with-osi-datadir directory with data files for using module Osi
     1122  --with-ositests-lib linker flags for using module OsiTests
     1123  --with-ositests-incdir directory with header files for using module OsiTests
     1124  --with-ositests-datadir directory with data files for using module OsiTests
    11191125  --with-sample-lib linker flags for using module Sample
    11201126  --with-sample-incdir directory with header files for using module Sample
     
    11561162it to find libraries and programs with nonstandard names/locations.
    11571163
    1158 Report bugs to <coin-clp@list.coin-or.org>.
     1164Report bugs to <clp@list.coin-or.org>.
    11591165_ACEOF
    11601166fi
     
    58055811*-*-irix6*)
    58065812  # Find out which ABI we are using.
    5807   echo '#line 5807 "configure"' > conftest.$ac_ext
     5813  echo '#line 5813 "configure"' > conftest.$ac_ext
    58085814  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58095815  (eval $ac_compile) 2>&5
     
    65826588    (
    65836589      cat <<\_ASBOX
    6584 ## ---------------------------------------- ##
    6585 ## Report this to coin-clp@list.coin-or.org ##
    6586 ## ---------------------------------------- ##
     6590## ----------------------------------- ##
     6591## Report this to clp@list.coin-or.org ##
     6592## ----------------------------------- ##
    65876593_ASBOX
    65886594    ) |
     
    69396945
    69406946# Provide some information about the compiler.
    6941 echo "$as_me:6941:" \
     6947echo "$as_me:6947:" \
    69426948     "checking for Fortran 77 compiler version" >&5
    69436949ac_compiler=`set X $ac_compile; echo $2`
     
    80068012   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80078013   -e 's:$: $lt_compiler_flag:'`
    8008    (eval echo "\"\$as_me:8008: $lt_compile\"" >&5)
     8014   (eval echo "\"\$as_me:8014: $lt_compile\"" >&5)
    80098015   (eval "$lt_compile" 2>conftest.err)
    80108016   ac_status=$?
    80118017   cat conftest.err >&5
    8012    echo "$as_me:8012: \$? = $ac_status" >&5
     8018   echo "$as_me:8018: \$? = $ac_status" >&5
    80138019   if (exit $ac_status) && test -s "$ac_outfile"; then
    80148020     # The compiler can only warn and ignore the option if not recognized
     
    82748280   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82758281   -e 's:$: $lt_compiler_flag:'`
    8276    (eval echo "\"\$as_me:8276: $lt_compile\"" >&5)
     8282   (eval echo "\"\$as_me:8282: $lt_compile\"" >&5)
    82778283   (eval "$lt_compile" 2>conftest.err)
    82788284   ac_status=$?
    82798285   cat conftest.err >&5
    8280    echo "$as_me:8280: \$? = $ac_status" >&5
     8286   echo "$as_me:8286: \$? = $ac_status" >&5
    82818287   if (exit $ac_status) && test -s "$ac_outfile"; then
    82828288     # The compiler can only warn and ignore the option if not recognized
     
    83788384   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83798385   -e 's:$: $lt_compiler_flag:'`
    8380    (eval echo "\"\$as_me:8380: $lt_compile\"" >&5)
     8386   (eval echo "\"\$as_me:8386: $lt_compile\"" >&5)
    83818387   (eval "$lt_compile" 2>out/conftest.err)
    83828388   ac_status=$?
    83838389   cat out/conftest.err >&5
    8384    echo "$as_me:8384: \$? = $ac_status" >&5
     8390   echo "$as_me:8390: \$? = $ac_status" >&5
    83858391   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    83868392   then
     
    1072310729  lt_status=$lt_dlunknown
    1072410730  cat > conftest.$ac_ext <<EOF
    10725 #line 10725 "configure"
     10731#line 10731 "configure"
    1072610732#include "confdefs.h"
    1072710733
     
    1082310829  lt_status=$lt_dlunknown
    1082410830  cat > conftest.$ac_ext <<EOF
    10825 #line 10825 "configure"
     10831#line 10831 "configure"
    1082610832#include "confdefs.h"
    1082710833
     
    1316713173   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1316813174   -e 's:$: $lt_compiler_flag:'`
    13169    (eval echo "\"\$as_me:13169: $lt_compile\"" >&5)
     13175   (eval echo "\"\$as_me:13175: $lt_compile\"" >&5)
    1317013176   (eval "$lt_compile" 2>conftest.err)
    1317113177   ac_status=$?
    1317213178   cat conftest.err >&5
    13173    echo "$as_me:13173: \$? = $ac_status" >&5
     13179   echo "$as_me:13179: \$? = $ac_status" >&5
    1317413180   if (exit $ac_status) && test -s "$ac_outfile"; then
    1317513181     # The compiler can only warn and ignore the option if not recognized
     
    1327113277   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1327213278   -e 's:$: $lt_compiler_flag:'`
    13273    (eval echo "\"\$as_me:13273: $lt_compile\"" >&5)
     13279   (eval echo "\"\$as_me:13279: $lt_compile\"" >&5)
    1327413280   (eval "$lt_compile" 2>out/conftest.err)
    1327513281   ac_status=$?
    1327613282   cat out/conftest.err >&5
    13277    echo "$as_me:13277: \$? = $ac_status" >&5
     13283   echo "$as_me:13283: \$? = $ac_status" >&5
    1327813284   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1327913285   then
     
    1484114847   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1484214848   -e 's:$: $lt_compiler_flag:'`
    14843    (eval echo "\"\$as_me:14843: $lt_compile\"" >&5)
     14849   (eval echo "\"\$as_me:14849: $lt_compile\"" >&5)
    1484414850   (eval "$lt_compile" 2>conftest.err)
    1484514851   ac_status=$?
    1484614852   cat conftest.err >&5
    14847    echo "$as_me:14847: \$? = $ac_status" >&5
     14853   echo "$as_me:14853: \$? = $ac_status" >&5
    1484814854   if (exit $ac_status) && test -s "$ac_outfile"; then
    1484914855     # The compiler can only warn and ignore the option if not recognized
     
    1494514951   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1494614952   -e 's:$: $lt_compiler_flag:'`
    14947    (eval echo "\"\$as_me:14947: $lt_compile\"" >&5)
     14953   (eval echo "\"\$as_me:14953: $lt_compile\"" >&5)
    1494814954   (eval "$lt_compile" 2>out/conftest.err)
    1494914955   ac_status=$?
    1495014956   cat out/conftest.err >&5
    14951    echo "$as_me:14951: \$? = $ac_status" >&5
     14957   echo "$as_me:14957: \$? = $ac_status" >&5
    1495214958   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1495314959   then
     
    1715217158   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1715317159   -e 's:$: $lt_compiler_flag:'`
    17154    (eval echo "\"\$as_me:17154: $lt_compile\"" >&5)
     17160   (eval echo "\"\$as_me:17160: $lt_compile\"" >&5)
    1715517161   (eval "$lt_compile" 2>conftest.err)
    1715617162   ac_status=$?
    1715717163   cat conftest.err >&5
    17158    echo "$as_me:17158: \$? = $ac_status" >&5
     17164   echo "$as_me:17164: \$? = $ac_status" >&5
    1715917165   if (exit $ac_status) && test -s "$ac_outfile"; then
    1716017166     # The compiler can only warn and ignore the option if not recognized
     
    1742017426   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1742117427   -e 's:$: $lt_compiler_flag:'`
    17422    (eval echo "\"\$as_me:17422: $lt_compile\"" >&5)
     17428   (eval echo "\"\$as_me:17428: $lt_compile\"" >&5)
    1742317429   (eval "$lt_compile" 2>conftest.err)
    1742417430   ac_status=$?
    1742517431   cat conftest.err >&5
    17426    echo "$as_me:17426: \$? = $ac_status" >&5
     17432   echo "$as_me:17432: \$? = $ac_status" >&5
    1742717433   if (exit $ac_status) && test -s "$ac_outfile"; then
    1742817434     # The compiler can only warn and ignore the option if not recognized
     
    1752417530   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752517531   -e 's:$: $lt_compiler_flag:'`
    17526    (eval echo "\"\$as_me:17526: $lt_compile\"" >&5)
     17532   (eval echo "\"\$as_me:17532: $lt_compile\"" >&5)
    1752717533   (eval "$lt_compile" 2>out/conftest.err)
    1752817534   ac_status=$?
    1752917535   cat out/conftest.err >&5
    17530    echo "$as_me:17530: \$? = $ac_status" >&5
     17536   echo "$as_me:17536: \$? = $ac_status" >&5
    1753117537   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1753217538   then
     
    2074520751
    2074620752
     20753echo "$as_me:$LINENO: checking for COIN module Osi" >&5
     20754echo $ECHO_N "checking for COIN module Osi... $ECHO_C" >&6
     20755
     20756coin_has_osi=notGiven
     20757
     20758# check if user wants to skip module in any case
     20759if test x"$COIN_SKIP_PROJECTS" != x; then
     20760  for dir in $COIN_SKIP_PROJECTS; do
     20761    if test $dir = "Osi"; then
     20762      coin_has_osi=skipping
     20763    fi
     20764  done
     20765fi
     20766
     20767OSI_LIBS=
     20768OSI_CFLAGS=
     20769OSI_DATA=
     20770
     20771
     20772
     20773
     20774
     20775required=1
     20776
     20777# execute third argument that can be used to overwrite flags like 'required'
     20778required=0
     20779
     20780#check if user provided LIBS, CFLAGS, and DATA for module
     20781if test $coin_has_osi != skipping; then
     20782
     20783
     20784# Check whether --with-m4_tolower(Osi)-lib or --without-m4_tolower(Osi)-lib was given.
     20785if test "${with_osi_lib+set}" = set; then
     20786  withval="$with_osi_lib"
     20787  coin_has_osi=yes
     20788       OSI_LIBS="$withval"
     20789       if test $required = 1; then
     20790         ADDLIBS="$ADDLIBS $withval"
     20791       fi
     20792
     20793fi;
     20794
     20795
     20796# Check whether --with-m4_tolower(Osi)-incdir or --without-m4_tolower(Osi)-incdir was given.
     20797if test "${with_osi_incdir+set}" = set; then
     20798  withval="$with_osi_incdir"
     20799  coin_has_osi=yes
     20800     OSI_CFLAGS="-I`${CYGPATH_W} $withval`"
     20801fi;
     20802
     20803
     20804# Check whether --with-m4_tolower(Osi)-datadir or --without-m4_tolower(Osi)-datadir was given.
     20805if test "${with_osi_datadir+set}" = set; then
     20806  withval="$with_osi_datadir"
     20807  coin_has_osi=yes
     20808     OSI_DATA="$withval"
     20809fi;
     20810fi
     20811
     20812if test $coin_has_osi = notGiven; then
     20813  if test -n "$PKG_CONFIG" ; then
     20814    # assemble search path for pkg-config
     20815    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     20816
     20817    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     20818    # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     20819    # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     20820    if test -d "${prefix}"; then
     20821      PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
     20822    fi
     20823
     20824
     20825# Check whether --with-coin-instdir or --without-coin-instdir was given.
     20826if test "${with_coin_instdir+set}" = set; then
     20827  withval="$with_coin_instdir"
     20828  if test -d "$withval"; then : ; else
     20829         { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     20830echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
     20831   { (exit 1); exit 1; }; }
     20832       fi
     20833       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
     20834
     20835fi;
     20836
     20837    # in a classic setup, we want to find uninstalled projects
     20838    # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     20839    # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     20840    # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
     20841    if test -e ../coin_subdirs.txt ; then
     20842      for i in `cat ../coin_subdirs.txt` ; do
     20843        PKG_CONFIG_PATH="../$i:$PKG_CONFIG_PATH"
     20844      done
     20845    fi
     20846
     20847    if test -e ../../coin_subdirs.txt ; then
     20848      for i in `cat ../../coin_subdirs.txt` ; do
     20849        PKG_CONFIG_PATH="../../$i:$PKG_CONFIG_PATH"
     20850      done
     20851    fi
     20852
     20853    # let pkg-config do it's magic
     20854    # need to export variable to be sure that the following pkg-config gets these values
     20855    export PKG_CONFIG_PATH
     20856
     20857
     20858
     20859if test -n "$PKG_CONFIG" ; then
     20860  if $PKG_CONFIG --exists "osi"; then
     20861    OSI_VERSIONS="`$PKG_CONFIG --modversion osi 2>/dev/null`"
     20862     cflags=`$PKG_CONFIG --cflags "osi" 2>/dev/null`
     20863    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     20864        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     20865        # but only do this if is not trivial
     20866    if test "$CYGPATH_W" != "echo" ; then
     20867      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
     20868          cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     20869        fi
     20870    OSI_CFLAGS="$cflags"
     20871    OSI_LIBS=`$PKG_CONFIG --libs "osi" 2>/dev/null`
     20872    OSI_DATA=`$PKG_CONFIG --variable=datadir "osi" 2>/dev/null`
     20873     coin_has_osi=yes
     20874        echo "$as_me:$LINENO: result: yes: $OSI_VERSIONS" >&5
     20875echo "${ECHO_T}yes: $OSI_VERSIONS" >&6
     20876        if test $required = 1; then
     20877          REQUIREDPACKAGES="$REQUIREDPACKAGES osi"
     20878        fi
     20879
     20880
     20881  else
     20882    OSI_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi`
     20883      coin_has_osi=notGiven
     20884        echo "$as_me:$LINENO: result: not given: $OSI_PKG_ERRORS" >&5
     20885echo "${ECHO_T}not given: $OSI_PKG_ERRORS" >&6
     20886
     20887  fi
     20888else
     20889  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Osi without pkg-config\"" >&5
     20890echo "$as_me: error: \"Cannot check for existance of module Osi without pkg-config\"" >&2;}
     20891   { (exit 1); exit 1; }; }
     20892fi
     20893
     20894
     20895
     20896
     20897    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     20898  else
     20899    echo "$as_me:$LINENO: result: skipped check via pkg-config" >&5
     20900echo "${ECHO_T}skipped check via pkg-config" >&6
     20901  fi
     20902
     20903else
     20904  echo "$as_me:$LINENO: result: $coin_has_osi" >&5
     20905echo "${ECHO_T}$coin_has_osi" >&6
     20906fi
     20907
     20908if test $coin_has_osi != skipping &&
     20909   test $coin_has_osi != notGiven ; then
     20910  if test -n "$OSI_CFLAGS" ; then
     20911    { echo "$as_me:$LINENO: Osi CFLAGS are $OSI_CFLAGS" >&5
     20912echo "$as_me: Osi CFLAGS are $OSI_CFLAGS" >&6;}
     20913  fi
     20914  if test -n "$OSI_LIBS" ; then
     20915    { echo "$as_me:$LINENO: Osi LIBS   are $OSI_LIBS" >&5
     20916echo "$as_me: Osi LIBS   are $OSI_LIBS" >&6;}
     20917  fi
     20918  if test -n "$OSI_DATA" ; then
     20919    { echo "$as_me:$LINENO: Osi DATA   is  $OSI_DATA" >&5
     20920echo "$as_me: Osi DATA   is  $OSI_DATA" >&6;}
     20921  fi
     20922
     20923cat >>confdefs.h <<\_ACEOF
     20924#define COIN_HAS_OSI 1
     20925_ACEOF
     20926
     20927fi
     20928
     20929# Define the Makefile conditional
     20930
     20931
     20932if test $coin_has_osi != notGiven &&
     20933                test $coin_has_osi != skipping; then
     20934  COIN_HAS_OSI_TRUE=
     20935  COIN_HAS_OSI_FALSE='#'
     20936else
     20937  COIN_HAS_OSI_TRUE='#'
     20938  COIN_HAS_OSI_FALSE=
     20939fi
     20940
     20941
     20942
     20943
     20944echo "$as_me:$LINENO: checking for COIN module OsiTests" >&5
     20945echo $ECHO_N "checking for COIN module OsiTests... $ECHO_C" >&6
     20946
     20947coin_has_ositests=notGiven
     20948
     20949# check if user wants to skip module in any case
     20950if test x"$COIN_SKIP_PROJECTS" != x; then
     20951  for dir in $COIN_SKIP_PROJECTS; do
     20952    if test $dir = "OsiTests"; then
     20953      coin_has_ositests=skipping
     20954    fi
     20955  done
     20956fi
     20957
     20958OSITESTS_LIBS=
     20959OSITESTS_CFLAGS=
     20960OSITESTS_DATA=
     20961
     20962
     20963
     20964
     20965
     20966required=1
     20967
     20968# execute third argument that can be used to overwrite flags like 'required'
     20969required=0
     20970
     20971#check if user provided LIBS, CFLAGS, and DATA for module
     20972if test $coin_has_ositests != skipping; then
     20973
     20974
     20975# Check whether --with-m4_tolower(OsiTests)-lib or --without-m4_tolower(OsiTests)-lib was given.
     20976if test "${with_ositests_lib+set}" = set; then
     20977  withval="$with_ositests_lib"
     20978  coin_has_ositests=yes
     20979       OSITESTS_LIBS="$withval"
     20980       if test $required = 1; then
     20981         ADDLIBS="$ADDLIBS $withval"
     20982       fi
     20983
     20984fi;
     20985
     20986
     20987# Check whether --with-m4_tolower(OsiTests)-incdir or --without-m4_tolower(OsiTests)-incdir was given.
     20988if test "${with_ositests_incdir+set}" = set; then
     20989  withval="$with_ositests_incdir"
     20990  coin_has_ositests=yes
     20991     OSITESTS_CFLAGS="-I`${CYGPATH_W} $withval`"
     20992fi;
     20993
     20994
     20995# Check whether --with-m4_tolower(OsiTests)-datadir or --without-m4_tolower(OsiTests)-datadir was given.
     20996if test "${with_ositests_datadir+set}" = set; then
     20997  withval="$with_ositests_datadir"
     20998  coin_has_ositests=yes
     20999     OSITESTS_DATA="$withval"
     21000fi;
     21001fi
     21002
     21003if test $coin_has_ositests = notGiven; then
     21004  if test -n "$PKG_CONFIG" ; then
     21005    # assemble search path for pkg-config
     21006    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     21007
     21008    # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     21009    # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     21010    # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     21011    if test -d "${prefix}"; then
     21012      PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:$PKG_CONFIG_PATH"
     21013    fi
     21014
     21015
     21016# Check whether --with-coin-instdir or --without-coin-instdir was given.
     21017if test "${with_coin_instdir+set}" = set; then
     21018  withval="$with_coin_instdir"
     21019  if test -d "$withval"; then : ; else
     21020         { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     21021echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
     21022   { (exit 1); exit 1; }; }
     21023       fi
     21024       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
     21025
     21026fi;
     21027
     21028    # in a classic setup, we want to find uninstalled projects
     21029    # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     21030    # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     21031    # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
     21032    if test -e ../coin_subdirs.txt ; then
     21033      for i in `cat ../coin_subdirs.txt` ; do
     21034        PKG_CONFIG_PATH="../$i:$PKG_CONFIG_PATH"
     21035      done
     21036    fi
     21037
     21038    if test -e ../../coin_subdirs.txt ; then
     21039      for i in `cat ../../coin_subdirs.txt` ; do
     21040        PKG_CONFIG_PATH="../../$i:$PKG_CONFIG_PATH"
     21041      done
     21042    fi
     21043
     21044    # let pkg-config do it's magic
     21045    # need to export variable to be sure that the following pkg-config gets these values
     21046    export PKG_CONFIG_PATH
     21047
     21048
     21049
     21050if test -n "$PKG_CONFIG" ; then
     21051  if $PKG_CONFIG --exists "osi-unittests"; then
     21052    OSITESTS_VERSIONS="`$PKG_CONFIG --modversion osi-unittests 2>/dev/null`"
     21053     cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null`
     21054    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     21055        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     21056        # but only do this if is not trivial
     21057    if test "$CYGPATH_W" != "echo" ; then
     21058      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
     21059          cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     21060        fi
     21061    OSITESTS_CFLAGS="$cflags"
     21062    OSITESTS_LIBS=`$PKG_CONFIG --libs "osi-unittests" 2>/dev/null`
     21063    OSITESTS_DATA=`$PKG_CONFIG --variable=datadir "osi-unittests" 2>/dev/null`
     21064     coin_has_ositests=yes
     21065        echo "$as_me:$LINENO: result: yes: $OSITESTS_VERSIONS" >&5
     21066echo "${ECHO_T}yes: $OSITESTS_VERSIONS" >&6
     21067        if test $required = 1; then
     21068          REQUIREDPACKAGES="$REQUIREDPACKAGES osi-unittests"
     21069        fi
     21070
     21071
     21072  else
     21073    OSITESTS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-unittests`
     21074      coin_has_ositests=notGiven
     21075        echo "$as_me:$LINENO: result: not given: $OSITESTS_PKG_ERRORS" >&5
     21076echo "${ECHO_T}not given: $OSITESTS_PKG_ERRORS" >&6
     21077
     21078  fi
     21079else
     21080  { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module OsiTests without pkg-config\"" >&5
     21081echo "$as_me: error: \"Cannot check for existance of module OsiTests without pkg-config\"" >&2;}
     21082   { (exit 1); exit 1; }; }
     21083fi
     21084
     21085
     21086
     21087
     21088    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     21089  else
     21090    echo "$as_me:$LINENO: result: skipped check via pkg-config" >&5
     21091echo "${ECHO_T}skipped check via pkg-config" >&6
     21092  fi
     21093
     21094else
     21095  echo "$as_me:$LINENO: result: $coin_has_ositests" >&5
     21096echo "${ECHO_T}$coin_has_ositests" >&6
     21097fi
     21098
     21099if test $coin_has_ositests != skipping &&
     21100   test $coin_has_ositests != notGiven ; then
     21101  if test -n "$OSITESTS_CFLAGS" ; then
     21102    { echo "$as_me:$LINENO: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&5
     21103echo "$as_me: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&6;}
     21104  fi
     21105  if test -n "$OSITESTS_LIBS" ; then
     21106    { echo "$as_me:$LINENO: OsiTests LIBS   are $OSITESTS_LIBS" >&5
     21107echo "$as_me: OsiTests LIBS   are $OSITESTS_LIBS" >&6;}
     21108  fi
     21109  if test -n "$OSITESTS_DATA" ; then
     21110    { echo "$as_me:$LINENO: OsiTests DATA   is  $OSITESTS_DATA" >&5
     21111echo "$as_me: OsiTests DATA   is  $OSITESTS_DATA" >&6;}
     21112  fi
     21113
     21114cat >>confdefs.h <<\_ACEOF
     21115#define COIN_HAS_OSITESTS 1
     21116_ACEOF
     21117
     21118fi
     21119
     21120# Define the Makefile conditional
     21121
     21122
     21123if test $coin_has_ositests != notGiven &&
     21124                test $coin_has_ositests != skipping; then
     21125  COIN_HAS_OSITESTS_TRUE=
     21126  COIN_HAS_OSITESTS_FALSE='#'
     21127else
     21128  COIN_HAS_OSITESTS_TRUE='#'
     21129  COIN_HAS_OSITESTS_FALSE=
     21130fi
     21131
     21132
     21133
     21134
    2074721135echo "$as_me:$LINENO: checking for COIN module Sample" >&5
    2074821136echo $ECHO_N "checking for COIN module Sample... $ECHO_C" >&6
     
    2112721515
    2112821516
     21517# fallback if no pkg-config is available
    2112921518if test "$coin_has_coinutils" != yes ; then
    2113021519  echo "$as_me:$LINENO: checking for COIN project CoinUtils" >&5
     
    2168522074# Here list all the files that configure should create (except for the
    2168622075# configuration header file)
    21687                                                                       ac_config_files="$ac_config_files Makefile examples/Makefile src/Makefile test/Makefile clp_addlibs.txt clp.pc clp-uninstalled.pc"
    21688 
     22076                                                                                ac_config_files="$ac_config_files Makefile examples/Makefile src/Makefile src/OsiClp/Makefile test/Makefile clp_addlibs.txt clp.pc clp-uninstalled.pc"
     22077
     22078
     22079if test $coin_has_osi = yes ; then
     22080                      ac_config_files="$ac_config_files src/OsiClp/osi-clp.pc osi-clp-uninstalled.pc:src/OsiClp/osi-clp-uninstalled.pc.in"
     22081
     22082fi
    2168922083
    2169022084# Here put the location and name of the configuration header file
     
    2189722291Usually this means the macro was only invoked conditionally." >&5
    2189822292echo "$as_me: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
     22293Usually this means the macro was only invoked conditionally." >&2;}
     22294   { (exit 1); exit 1; }; }
     22295fi
     22296if test -z "${COIN_HAS_OSI_TRUE}" && test -z "${COIN_HAS_OSI_FALSE}"; then
     22297  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_OSI\" was never defined.
     22298Usually this means the macro was only invoked conditionally." >&5
     22299echo "$as_me: error: conditional \"COIN_HAS_OSI\" was never defined.
     22300Usually this means the macro was only invoked conditionally." >&2;}
     22301   { (exit 1); exit 1; }; }
     22302fi
     22303if test -z "${COIN_HAS_OSITESTS_TRUE}" && test -z "${COIN_HAS_OSITESTS_FALSE}"; then
     22304  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_OSITESTS\" was never defined.
     22305Usually this means the macro was only invoked conditionally." >&5
     22306echo "$as_me: error: conditional \"COIN_HAS_OSITESTS\" was never defined.
    2189922307Usually this means the macro was only invoked conditionally." >&2;}
    2190022308   { (exit 1); exit 1; }; }
     
    2236822776  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
    2236922777  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     22778  "src/OsiClp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/OsiClp/Makefile" ;;
    2237022779  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
    2237122780  "clp_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES clp_addlibs.txt" ;;
    2237222781  "clp.pc" ) CONFIG_FILES="$CONFIG_FILES clp.pc" ;;
    2237322782  "clp-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES clp-uninstalled.pc" ;;
     22783  "src/OsiClp/osi-clp.pc" ) CONFIG_FILES="$CONFIG_FILES src/OsiClp/osi-clp.pc" ;;
     22784  "osi-clp-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES osi-clp-uninstalled.pc:src/OsiClp/osi-clp-uninstalled.pc.in" ;;
    2237422785  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2237522786  "inc/config_clp.h" ) CONFIG_HEADERS="$CONFIG_HEADERS inc/config_clp.h" ;;
     
    2256622977s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
    2256722978s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
     22979s,@OSI_LIBS@,$OSI_LIBS,;t t
     22980s,@OSI_CFLAGS@,$OSI_CFLAGS,;t t
     22981s,@OSI_DATA@,$OSI_DATA,;t t
     22982s,@COIN_HAS_OSI_TRUE@,$COIN_HAS_OSI_TRUE,;t t
     22983s,@COIN_HAS_OSI_FALSE@,$COIN_HAS_OSI_FALSE,;t t
     22984s,@OSITESTS_LIBS@,$OSITESTS_LIBS,;t t
     22985s,@OSITESTS_CFLAGS@,$OSITESTS_CFLAGS,;t t
     22986s,@OSITESTS_DATA@,$OSITESTS_DATA,;t t
     22987s,@COIN_HAS_OSITESTS_TRUE@,$COIN_HAS_OSITESTS_TRUE,;t t
     22988s,@COIN_HAS_OSITESTS_FALSE@,$COIN_HAS_OSITESTS_FALSE,;t t
    2256822989s,@SAMPLE_LIBS@,$SAMPLE_LIBS,;t t
    2256922990s,@SAMPLE_CFLAGS@,$SAMPLE_CFLAGS,;t t
  • branches/split/Clp/configure.ac

    r1522 r1527  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Clp],[trunk],[coin-clp@list.coin-or.org])
     15AC_INIT([Clp],[trunk],[clp@list.coin-or.org])
    1616
    1717AC_COPYRIGHT([
     
    2323# List one file in the package so that the configure script can test
    2424# whether the package is actually there
    25 AC_CONFIG_SRCDIR(src/ClpCholeskyBase.cpp)
     25AC_CONFIG_SRCDIR(src/ClpSimplex.cpp)
    2626
    2727# Where should everything be installed by default?  Here, we want it
     
    5858
    5959AC_COIN_HAS_MODULE(CoinUtils,  [coinutils = split])
     60AC_COIN_HAS_MODULE(Osi,        [osi],            [required=0])
     61AC_COIN_HAS_MODULE(OsiTests,   [osi-unittests],  [required=0])
    6062AC_COIN_HAS_MODULE(Sample,     [coindatasample], [required=0])
    6163AC_COIN_HAS_MODULE(Netlib,     [coindatanetlib], [required=0])
    6264
     65# fallback if no pkg-config is available
    6366if test "$coin_has_coinutils" != yes ; then
    6467  AC_COIN_HAS_PROJECT(CoinUtils)
     
    137140                 examples/Makefile
    138141                 src/Makefile
     142                 src/OsiClp/Makefile
    139143                 test/Makefile
    140144                 clp_addlibs.txt
    141145                 clp.pc
    142146                 clp-uninstalled.pc])
     147                 
     148if test $coin_has_osi = yes ; then
     149  AC_CONFIG_FILES([src/OsiClp/osi-clp.pc
     150                   osi-clp-uninstalled.pc:src/OsiClp/osi-clp-uninstalled.pc.in])
     151fi
    143152
    144153# Here put the location and name of the configuration header file
  • branches/split/Clp/inc/config_clp.h.in

    r1522 r1527  
    1515/* Define to 1 if the Netlib module is available */
    1616#undef COIN_HAS_NETLIB
     17
     18/* Define to 1 if the Osi module is available */
     19#undef COIN_HAS_OSI
     20
     21/* Define to 1 if the OsiTests module is available */
     22#undef COIN_HAS_OSITESTS
    1723
    1824/* Define to 1 if readline is available */
  • branches/split/Clp/src/Makefile.am

    r1522 r1527  
    88
    99AUTOMAKE_OPTIONS = foreign
     10
     11if COIN_HAS_OSI
     12  SUBDIRS = OsiClp
     13endif
    1014
    1115########################################################################
  • branches/split/Clp/src/Makefile.in

    r1522 r1527  
    114114SOURCES = $(libClp_la_SOURCES) $(clp_SOURCES)
    115115DIST_SOURCES = $(libClp_la_SOURCES) $(clp_SOURCES)
     116RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
     117        html-recursive info-recursive install-data-recursive \
     118        install-exec-recursive install-info-recursive \
     119        install-recursive installcheck-recursive installdirs-recursive \
     120        pdf-recursive ps-recursive uninstall-info-recursive \
     121        uninstall-recursive
    116122includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    117123HEADERS = $(includecoin_HEADERS)
    118124ETAGS = etags
    119125CTAGS = ctags
     126DIST_SUBDIRS = OsiClp
    120127DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    121128ABSBUILDDIR = @ABSBUILDDIR@
     
    150157COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
    151158COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     159COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
     160COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     161COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
     162COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    152163COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
    153164COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
     
    200211OPT_CFLAGS = @OPT_CFLAGS@
    201212OPT_CXXFLAGS = @OPT_CXXFLAGS@
     213OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     214OSITESTS_DATA = @OSITESTS_DATA@
     215OSITESTS_LIBS = @OSITESTS_LIBS@
     216OSI_CFLAGS = @OSI_CFLAGS@
     217OSI_DATA = @OSI_DATA@
     218OSI_LIBS = @OSI_LIBS@
    202219PACKAGE = @PACKAGE@
    203220PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    274291target_alias = @target_alias@
    275292AUTOMAKE_OPTIONS = foreign
     293@COIN_HAS_OSI_TRUE@SUBDIRS = OsiClp
    276294
    277295########################################################################
     
    430448# You only need to adapt the following line
    431449ConfigHeader = ClpConfig.h
    432 all: all-am
     450all: all-recursive
    433451
    434452.SUFFIXES:
     
    634652        done
    635653
     654# This directory's subdirectories are mostly independent; you can cd
     655# into them and run `make' without going through this Makefile.
     656# To change the values of `make' variables: instead of editing Makefiles,
     657# (1) if the variable is set in `config.status', edit `config.status'
     658#     (which will cause the Makefiles to be regenerated when you run `make');
     659# (2) otherwise, pass the desired values on the `make' command line.
     660$(RECURSIVE_TARGETS):
     661        @failcom='exit 1'; \
     662        for f in x $$MAKEFLAGS; do \
     663          case $$f in \
     664            *=* | --[!k]*);; \
     665            *k*) failcom='fail=yes';; \
     666          esac; \
     667        done; \
     668        dot_seen=no; \
     669        target=`echo $@ | sed s/-recursive//`; \
     670        list='$(SUBDIRS)'; for subdir in $$list; do \
     671          echo "Making $$target in $$subdir"; \
     672          if test "$$subdir" = "."; then \
     673            dot_seen=yes; \
     674            local_target="$$target-am"; \
     675          else \
     676            local_target="$$target"; \
     677          fi; \
     678          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     679          || eval $$failcom; \
     680        done; \
     681        if test "$$dot_seen" = "no"; then \
     682          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
     683        fi; test -z "$$fail"
     684
     685mostlyclean-recursive clean-recursive distclean-recursive \
     686maintainer-clean-recursive:
     687        @failcom='exit 1'; \
     688        for f in x $$MAKEFLAGS; do \
     689          case $$f in \
     690            *=* | --[!k]*);; \
     691            *k*) failcom='fail=yes';; \
     692          esac; \
     693        done; \
     694        dot_seen=no; \
     695        case "$@" in \
     696          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
     697          *) list='$(SUBDIRS)' ;; \
     698        esac; \
     699        rev=''; for subdir in $$list; do \
     700          if test "$$subdir" = "."; then :; else \
     701            rev="$$subdir $$rev"; \
     702          fi; \
     703        done; \
     704        rev="$$rev ."; \
     705        target=`echo $@ | sed s/-recursive//`; \
     706        for subdir in $$rev; do \
     707          echo "Making $$target in $$subdir"; \
     708          if test "$$subdir" = "."; then \
     709            local_target="$$target-am"; \
     710          else \
     711            local_target="$$target"; \
     712          fi; \
     713          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     714          || eval $$failcom; \
     715        done && test -z "$$fail"
     716tags-recursive:
     717        list='$(SUBDIRS)'; for subdir in $$list; do \
     718          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
     719        done
     720ctags-recursive:
     721        list='$(SUBDIRS)'; for subdir in $$list; do \
     722          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
     723        done
     724
    636725ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    637726        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     
    644733tags: TAGS
    645734
    646 TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     735TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    647736                $(TAGS_FILES) $(LISP)
    648737        tags=; \
    649738        here=`pwd`; \
     739        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
     740          include_option=--etags-include; \
     741          empty_fix=.; \
     742        else \
     743          include_option=--include; \
     744          empty_fix=; \
     745        fi; \
     746        list='$(SUBDIRS)'; for subdir in $$list; do \
     747          if test "$$subdir" = .; then :; else \
     748            test ! -f $$subdir/TAGS || \
     749              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
     750          fi; \
     751        done; \
    650752        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    651753        unique=`for i in $$list; do \
     
    660762        fi
    661763ctags: CTAGS
    662 CTAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     764CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    663765                $(TAGS_FILES) $(LISP)
    664766        tags=; \
     
    710812          fi; \
    711813        done
     814        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     815          if test "$$subdir" = .; then :; else \
     816            test -d "$(distdir)/$$subdir" \
     817            || $(mkdir_p) "$(distdir)/$$subdir" \
     818            || exit 1; \
     819            distdir=`$(am__cd) $(distdir) && pwd`; \
     820            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
     821            (cd $$subdir && \
     822              $(MAKE) $(AM_MAKEFLAGS) \
     823                top_distdir="$$top_distdir" \
     824                distdir="$$distdir/$$subdir" \
     825                distdir) \
     826              || exit 1; \
     827          fi; \
     828        done
    712829check-am: all-am
    713 check: check-am
     830check: check-recursive
    714831all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
    715 installdirs:
     832installdirs: installdirs-recursive
     833installdirs-am:
    716834        for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    717835          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    718836        done
    719 install: install-am
    720 install-exec: install-exec-am
    721 install-data: install-data-am
    722 uninstall: uninstall-am
     837install: install-recursive
     838install-exec: install-exec-recursive
     839install-data: install-data-recursive
     840uninstall: uninstall-recursive
    723841
    724842install-am: all-am
    725843        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    726844
    727 installcheck: installcheck-am
     845installcheck: installcheck-recursive
    728846install-strip:
    729847        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
     
    741859        @echo "This command is intended for maintainers to use"
    742860        @echo "it deletes files that may require special tools to rebuild."
    743 clean: clean-am
     861clean: clean-recursive
    744862
    745863clean-am: clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
    746864        clean-libtool mostlyclean-am
    747865
    748 distclean: distclean-am
     866distclean: distclean-recursive
    749867        -rm -rf ./$(DEPDIR)
    750868        -rm -f Makefile
     
    752870        distclean-libtool distclean-tags
    753871
    754 dvi: dvi-am
     872dvi: dvi-recursive
    755873
    756874dvi-am:
    757875
    758 html: html-am
    759 
    760 info: info-am
     876html: html-recursive
     877
     878info: info-recursive
    761879
    762880info-am:
     
    766884install-exec-am: install-binPROGRAMS install-exec-local
    767885
    768 install-info: install-info-am
     886install-info: install-info-recursive
    769887
    770888install-man:
     
    772890installcheck-am:
    773891
    774 maintainer-clean: maintainer-clean-am
     892maintainer-clean: maintainer-clean-recursive
    775893        -rm -rf ./$(DEPDIR)
    776894        -rm -f Makefile
    777895maintainer-clean-am: distclean-am maintainer-clean-generic
    778896
    779 mostlyclean: mostlyclean-am
     897mostlyclean: mostlyclean-recursive
    780898
    781899mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    782900        mostlyclean-libtool
    783901
    784 pdf: pdf-am
     902pdf: pdf-recursive
    785903
    786904pdf-am:
    787905
    788 ps: ps-am
     906ps: ps-recursive
    789907
    790908ps-am:
     
    793911        uninstall-includecoinHEADERS uninstall-info-am uninstall-local
    794912
    795 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
    796         clean-coinlibLTLIBRARIES clean-generic clean-libtool ctags \
    797         distclean distclean-compile distclean-generic \
    798         distclean-libtool distclean-tags distdir dvi dvi-am html \
     913uninstall-info: uninstall-info-recursive
     914
     915.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
     916        clean clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
     917        clean-libtool clean-recursive ctags ctags-recursive distclean \
     918        distclean-compile distclean-generic distclean-libtool \
     919        distclean-recursive distclean-tags distdir dvi dvi-am html \
    799920        html-am info info-am install install-am install-binPROGRAMS \
    800921        install-coinlibLTLIBRARIES install-data install-data-am \
     
    802923        install-includecoinHEADERS install-info install-info-am \
    803924        install-man install-strip installcheck installcheck-am \
    804         installdirs maintainer-clean maintainer-clean-generic \
     925        installdirs installdirs-am maintainer-clean \
     926        maintainer-clean-generic maintainer-clean-recursive \
    805927        mostlyclean mostlyclean-compile mostlyclean-generic \
    806         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    807         uninstall-am uninstall-binPROGRAMS \
    808         uninstall-coinlibLTLIBRARIES uninstall-includecoinHEADERS \
    809         uninstall-info-am uninstall-local
     928        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
     929        tags tags-recursive uninstall uninstall-am \
     930        uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
     931        uninstall-includecoinHEADERS uninstall-info-am uninstall-local
    810932
    811933
  • branches/split/Clp/test/Makefile.am

    r1522 r1527  
    1010
    1111########################################################################
     12#                         unitTest for OsiClp                          #
     13########################################################################
     14
     15if COIN_HAS_OSITESTS
     16
     17noinst_PROGRAMS = osiUnitTest
     18
     19osiUnitTest_SOURCES = osiUnitTest.cpp OsiClpSolverInterfaceTest.cpp
     20
     21osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
     22
     23LIBS += $(COINUTILS_LIBS) $(OSITESTS_LIBS)
     24
     25AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSITESTS_CFLAGS) \
     26        -I`$(CYGPATH_W) $(srcdir)/../src` \
     27        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
     28
     29testdepend =  osiUnitTest$(EXEEXT)
     30endif
     31
     32########################################################################
    1233#                         unitTest for Clp                             #
    1334########################################################################
    1435
    1536unittestflags =
     37osiunittestflags =
    1638if COIN_HAS_SAMPLE
    1739  unittestflags += -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
     40  osiunittestflags += -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
    1841endif
    1942unittestflags += -unitTest
    2043if COIN_HAS_NETLIB
    2144  unittestflags += -dirNetlib `$(CYGPATH_W) $(NETLIB_DATA)` -netlib
     45  osiunittestflags += -netlibDir=`$(CYGPATH_W) $(NETLIB_DATA)` -testOsiSolverInterface
    2246endif
    2347
    2448# We are using the CLP solver executable to do the unit test
    25 test: ../src/clp$(EXEEXT)
    26         ../src/clp$(EXEEXT) $(unittestflags)
     49test: ../src/clp$(EXEEXT) $(testdepend)
     50        ../src/clp$(EXEEXT) $(unittestflags) || exit 1
     51        if test -e osiUnitTest$(EXEEXT) ; then \
     52          osiUnitTest$(EXEEXT) $(osiunittestflags) || exit 1 ; \
     53        fi
    2754
    2855.PHONY: test
  • branches/split/Clp/test/Makefile.in

    r1522 r1527  
    2020
    2121# Author:  Andreas Waechter           IBM    2006-04-13
     22
    2223srcdir = @srcdir@
    2324top_srcdir = @top_srcdir@
     
    4243build_triplet = @build@
    4344host_triplet = @host@
    44 @COIN_HAS_SAMPLE_TRUE@am__append_1 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
    45 @COIN_HAS_NETLIB_TRUE@am__append_2 = -dirNetlib `$(CYGPATH_W) $(NETLIB_DATA)` -netlib
     45@COIN_HAS_OSITESTS_TRUE@noinst_PROGRAMS = osiUnitTest$(EXEEXT)
     46@COIN_HAS_OSITESTS_TRUE@am__append_1 = $(COINUTILS_LIBS) $(OSITESTS_LIBS)
     47@COIN_HAS_SAMPLE_TRUE@am__append_2 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
     48@COIN_HAS_SAMPLE_TRUE@am__append_3 = -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
     49@COIN_HAS_NETLIB_TRUE@am__append_4 = -dirNetlib `$(CYGPATH_W) $(NETLIB_DATA)` -netlib
     50@COIN_HAS_NETLIB_TRUE@am__append_5 = -netlibDir=`$(CYGPATH_W) $(NETLIB_DATA)` -testOsiSolverInterface
    4651subdir = test
    4752DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    5459CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
    5560CONFIG_CLEAN_FILES =
    56 SOURCES =
    57 DIST_SOURCES =
     61PROGRAMS = $(noinst_PROGRAMS)
     62am__osiUnitTest_SOURCES_DIST = osiUnitTest.cpp \
     63        OsiClpSolverInterfaceTest.cpp
     64@COIN_HAS_OSITESTS_TRUE@am_osiUnitTest_OBJECTS =  \
     65@COIN_HAS_OSITESTS_TRUE@        osiUnitTest.$(OBJEXT) \
     66@COIN_HAS_OSITESTS_TRUE@        OsiClpSolverInterfaceTest.$(OBJEXT)
     67osiUnitTest_OBJECTS = $(am_osiUnitTest_OBJECTS)
     68@COIN_HAS_OSITESTS_TRUE@osiUnitTest_DEPENDENCIES = ../src/libClp.la \
     69@COIN_HAS_OSITESTS_TRUE@        ../src/OsiClp/libOsiClp.la
     70DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
     71depcomp = $(SHELL) $(top_srcdir)/../depcomp
     72am__depfiles_maybe = depfiles
     73CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     74        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     75LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
     76        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     77        $(AM_CXXFLAGS) $(CXXFLAGS)
     78CXXLD = $(CXX)
     79CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     80        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     81SOURCES = $(osiUnitTest_SOURCES)
     82DIST_SOURCES = $(am__osiUnitTest_SOURCES_DIST)
     83ETAGS = etags
     84CTAGS = ctags
    5885DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    5986ABSBUILDDIR = @ABSBUILDDIR@
     
    88115COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
    89116COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     117COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
     118COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     119COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
     120COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    90121COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
    91122COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
     
    120151LIBEXT = @LIBEXT@
    121152LIBOBJS = @LIBOBJS@
    122 LIBS = @LIBS@
     153LIBS = @LIBS@ $(am__append_1)
    123154LIBTOOL = @LIBTOOL@
    124155LIBTOOLM4 = @LIBTOOLM4@
     
    138169OPT_CFLAGS = @OPT_CFLAGS@
    139170OPT_CXXFLAGS = @OPT_CXXFLAGS@
     171OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     172OSITESTS_DATA = @OSITESTS_DATA@
     173OSITESTS_LIBS = @OSITESTS_LIBS@
     174OSI_CFLAGS = @OSI_CFLAGS@
     175OSI_DATA = @OSI_DATA@
     176OSI_LIBS = @OSI_LIBS@
    140177PACKAGE = @PACKAGE@
    141178PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    212249target_alias = @target_alias@
    213250AUTOMAKE_OPTIONS = foreign
     251@COIN_HAS_OSITESTS_TRUE@osiUnitTest_SOURCES = osiUnitTest.cpp OsiClpSolverInterfaceTest.cpp
     252@COIN_HAS_OSITESTS_TRUE@osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
     253@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSITESTS_CFLAGS) \
     254@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src` \
     255@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
     256
     257@COIN_HAS_OSITESTS_TRUE@testdepend = osiUnitTest$(EXEEXT)
    214258
    215259########################################################################
    216260#                         unitTest for Clp                             #
    217261########################################################################
    218 unittestflags = $(am__append_1) -unitTest $(am__append_2)
     262unittestflags = $(am__append_2) -unitTest $(am__append_4)
     263osiunittestflags = $(am__append_3) $(am__append_5)
    219264
    220265########################################################################
     
    228273
    229274.SUFFIXES:
     275.SUFFIXES: .cpp .lo .o .obj
    230276$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
    231277        @for dep in $?; do \
     
    258304        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    259305
     306clean-noinstPROGRAMS:
     307        @list='$(noinst_PROGRAMS)'; for p in $$list; do \
     308          f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
     309          echo " rm -f $$p $$f"; \
     310          rm -f $$p $$f ; \
     311        done
     312osiUnitTest$(EXEEXT): $(osiUnitTest_OBJECTS) $(osiUnitTest_DEPENDENCIES)
     313        @rm -f osiUnitTest$(EXEEXT)
     314        $(CXXLINK) $(osiUnitTest_LDFLAGS) $(osiUnitTest_OBJECTS) $(osiUnitTest_LDADD) $(LIBS)
     315
     316mostlyclean-compile:
     317        -rm -f *.$(OBJEXT)
     318
     319distclean-compile:
     320        -rm -f *.tab.c
     321
     322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OsiClpSolverInterfaceTest.Po@am__quote@
     323@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osiUnitTest.Po@am__quote@
     324
     325.cpp.o:
     326@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     327@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     328@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     329@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     330@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
     331
     332.cpp.obj:
     333@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
     334@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     335@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     336@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     337@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     338
     339.cpp.lo:
     340@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     341@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     342@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     343@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     344@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     345
    260346mostlyclean-libtool:
    261347        -rm -f *.lo
     
    267353        -rm -f libtool
    268354uninstall-info-am:
     355
     356ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
     357        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     358        unique=`for i in $$list; do \
     359            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     360          done | \
     361          $(AWK) '    { files[$$0] = 1; } \
     362               END { for (i in files) print i; }'`; \
     363        mkid -fID $$unique
    269364tags: TAGS
    270 TAGS:
    271 
     365
     366TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     367                $(TAGS_FILES) $(LISP)
     368        tags=; \
     369        here=`pwd`; \
     370        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
     371        unique=`for i in $$list; do \
     372            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     373          done | \
     374          $(AWK) '    { files[$$0] = 1; } \
     375               END { for (i in files) print i; }'`; \
     376        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     377          test -n "$$unique" || unique=$$empty_fix; \
     378          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     379            $$tags $$unique; \
     380        fi
    272381ctags: CTAGS
    273 CTAGS:
    274 
     382CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     383                $(TAGS_FILES) $(LISP)
     384        tags=; \
     385        here=`pwd`; \
     386        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
     387        unique=`for i in $$list; do \
     388            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     389          done | \
     390          $(AWK) '    { files[$$0] = 1; } \
     391               END { for (i in files) print i; }'`; \
     392        test -z "$(CTAGS_ARGS)$$tags$$unique" \
     393          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
     394             $$tags $$unique
     395
     396GTAGS:
     397        here=`$(am__cd) $(top_builddir) && pwd` \
     398          && cd $(top_srcdir) \
     399          && gtags -i $(GTAGS_ARGS) $$here
     400
     401distclean-tags:
     402        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
    275403
    276404distdir: $(DISTFILES)
     
    303431check-am: all-am
    304432check: check-am
    305 all-am: Makefile
     433all-am: Makefile $(PROGRAMS)
    306434installdirs:
    307435install: install-am
     
    332460clean: clean-am
    333461
    334 clean-am: clean-generic clean-libtool mostlyclean-am
     462clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
     463        mostlyclean-am
    335464
    336465distclean: distclean-am
     466        -rm -rf ./$(DEPDIR)
    337467        -rm -f Makefile
    338 distclean-am: clean-am distclean-generic distclean-libtool
     468distclean-am: clean-am distclean-compile distclean-generic \
     469        distclean-libtool distclean-tags
    339470
    340471dvi: dvi-am
     
    359490
    360491maintainer-clean: maintainer-clean-am
     492        -rm -rf ./$(DEPDIR)
    361493        -rm -f Makefile
    362494maintainer-clean-am: distclean-am maintainer-clean-generic
     
    364496mostlyclean: mostlyclean-am
    365497
    366 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
     498mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     499        mostlyclean-libtool
    367500
    368501pdf: pdf-am
     
    376509uninstall-am: uninstall-info-am
    377510
    378 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
    379         distclean distclean-generic distclean-libtool distdir dvi \
    380         dvi-am html html-am info info-am install install-am \
    381         install-data install-data-am install-exec install-exec-am \
    382         install-info install-info-am install-man install-strip \
    383         installcheck installcheck-am installdirs maintainer-clean \
    384         maintainer-clean-generic mostlyclean mostlyclean-generic \
    385         mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
     511.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     512        clean-libtool clean-noinstPROGRAMS ctags distclean \
     513        distclean-compile distclean-generic distclean-libtool \
     514        distclean-tags distdir dvi dvi-am html html-am info info-am \
     515        install install-am install-data install-data-am install-exec \
     516        install-exec-am install-info install-info-am install-man \
     517        install-strip installcheck installcheck-am installdirs \
     518        maintainer-clean maintainer-clean-generic mostlyclean \
     519        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     520        pdf pdf-am ps ps-am tags uninstall uninstall-am \
    386521        uninstall-info-am
    387522
    388523
    389524# We are using the CLP solver executable to do the unit test
    390 test: ../src/clp$(EXEEXT)
    391         ../src/clp$(EXEEXT) $(unittestflags)
     525test: ../src/clp$(EXEEXT) $(testdepend)
     526        ../src/clp$(EXEEXT) $(unittestflags) || exit 1
     527        if test -e osiUnitTest$(EXEEXT) ; then \
     528          osiUnitTest$(EXEEXT) $(osiunittestflags) || exit 1 ; \
     529        fi
    392530
    393531.PHONY: test
Note: See TracChangeset for help on using the changeset viewer.