Changeset 1743


Ignore:
Timestamp:
Nov 26, 2010 5:48:20 PM (9 years ago)
Author:
stefan
Message:

fix makefiles for experimental/FP and experimental/Separable

Location:
branches/split/Bonmin/experimental
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Bonmin/experimental/FP/Makefile.am

    r434 r1743  
    1111# What is done in this directory:
    1212
    13 
    14   bin_PROGRAMS = oa_fp
    15 
    16 
    17 COINLIBS = \
    18         $(CBCOBJDIR)/src/libCbc.la \
    19         $(CGLOBJDIR)/src/libCgl.la \
    20         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    21         $(OSIOBJDIR)/src/libOsi.la \
    22         $(CLPOBJDIR)/src/libClp.la \
    23         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    24 
    25 if COIN_HAS_CPX
    26   COINLIBS += \
    27         $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la \
    28         $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    29         $(CPXLIB)
    30 endif
    31 
    32 IPOPTLIBS = \
    33         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    34 
    35 LIBS += `cat $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt`
    36 
     13bin_PROGRAMS = oa_fp
    3714
    3815# Here list all include flags, relative to this "srcdir" directory.  This
    3916# "cygpath" stuff is necessary to compile with native compilers on Windows
    40 AM_CPPFLAGS = \
     17AM_CPPFLAGS = $(BONMINLIB_CFLAGS) $(ASL_CFLAGS) \
    4118        -I`$(CYGPATH_W) $(srcdir)/../../src/OaAlgorithms` \
    4219        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces` \
    4320        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ipopt` \
    4421        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
    45         -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` \
    46         -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    47         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    48         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` \
    49         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg` \
    50         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Apps/AmplSolver` \
    51         -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    52         -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    53         -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` \
    54         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    55         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    56         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    57         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    58         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    59         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`\
    60         -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    61         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglGomory` \
    62         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglProbing` \
    63         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglOddHole` \
    64         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    65         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` \
    66         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglMixedIntegerRounding` \
    67         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
    68         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglKnapsackCover` \
    69         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglPreProcess` \
    70         -I`$(CYGPATH_W) $(CGLSRCDIR)/src`
     22        -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin`
    7123
     24# OAFeasibilityPump.cpp needs to include cplex.h
    7225if COIN_HAS_CPX
    73   AM_CPPFLAGS += \
    74         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    75         -I`$(CYGPATH_W) $(CPXINCDIR)`
     26  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)`
    7627endif
    7728
    78 # The following is a trick to get the source code of Cbc/Samples correctly in
    79 # here, and also to get a link to libCbc into this directory (so that it
    80 # is made)
    81 CbcCompareUser.cpp: $(CBCSRCDIR)/examples/CbcCompareUser.cpp
    82         rm -f $@
    83         $(LN_S) $< $@
    84 
    85 CbcBranchUser.cpp: $(CBCSRCDIR)/examples//CbcBranchUser.cpp
    86         rm -f $@
    87         $(LN_S) $< $@
     29#TODO: get CbcCompareUser.cpp and CbcBranchUser.cpp from Cbc/examples
     30#TODO: get libOsiCbc via check in configure
    8831
    8932########################################################################
     
    9437
    9538oa_fp_LDADD = \
    96         ../../src/CbcBonmin/libbonmin.la \
    97         ../../src/Interfaces/Ampl/libamplinterface.la \
    98         $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    99         $(IPOPTLIBS) \
    100         $(LIBCBCCOPY) \
    101         $(COINLIBS) \
    102         $(ASLLIB) \
    103         $(ADDLIBS)
    104 
     39        ../../src/Interfaces/Ampl/libbonamplinterface.la \
     40        ../../src/CbcBonmin/libbonmin.la \
     41        $(ASL_LIBS) \
     42        $(BONMINLIB_LIBS)
    10543
    10644# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    11351########################################################################
    11452
    115 CLEANFILES = $(LIBCBCCOPY)
     53CLEANFILES =
    11654
    117 DISTCLEANFILES = \
    118         CbcCompareUser.cpp CbcBranchUser.cpp
    119 
     55DISTCLEANFILES =
  • branches/split/Bonmin/experimental/FP/Makefile.in

    r1470 r1743  
    4444host_triplet = @host@
    4545bin_PROGRAMS = oa_fp$(EXEEXT)
    46 @COIN_HAS_CPX_TRUE@am__append_1 = \
    47 @COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la \
    48 @COIN_HAS_CPX_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    49 @COIN_HAS_CPX_TRUE@     $(CPXLIB)
    50 
    51 @COIN_HAS_CPX_TRUE@am__append_2 = \
    52 @COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    53 @COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(CPXINCDIR)`
    54 
    5546subdir = experimental/FP
    5647DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    6859am_oa_fp_OBJECTS = OAFeasibilityPump.$(OBJEXT) FP.$(OBJEXT)
    6960oa_fp_OBJECTS = $(am_oa_fp_OBJECTS)
    70 am__DEPENDENCIES_1 = $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    71 am__DEPENDENCIES_2 =
    72 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_3 =  \
    73 @COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la \
    74 @COIN_HAS_CPX_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    75 @COIN_HAS_CPX_TRUE@     $(am__DEPENDENCIES_2)
    76 am__DEPENDENCIES_4 = $(CBCOBJDIR)/src/libCbc.la \
    77         $(CGLOBJDIR)/src/libCgl.la \
    78         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    79         $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    80         $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__DEPENDENCIES_3)
    81 oa_fp_DEPENDENCIES = ../../src/CbcBonmin/libbonmin.la \
    82         ../../src/Interfaces/Ampl/libamplinterface.la \
    83         $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    84         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
    85         $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
     61am__DEPENDENCIES_1 =
     62oa_fp_DEPENDENCIES = ../../src/Interfaces/Ampl/libamplinterface.la \
     63        ../../src/CbcBonmin/libbonmin.la $(am__DEPENDENCIES_1) \
     64        $(am__DEPENDENCIES_1)
    8665DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    8766depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    10887CTAGS = ctags
    10988DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     89ABSBUILDDIR = @ABSBUILDDIR@
    11090ACLOCAL = @ACLOCAL@
    11191ADDLIBS = @ADDLIBS@
     
    11999AMTAR = @AMTAR@
    120100AR = @AR@
    121 ASLLIB = @ASLLIB@
    122 ASL_CPPFLAGS = @ASL_CPPFLAGS@
     101ASL_CFLAGS = @ASL_CFLAGS@
     102ASL_DATA = @ASL_DATA@
     103ASL_LIBS = @ASL_LIBS@
    123104ASTYLE = @ASTYLE@
    124105ASTYLEFLAGS = @ASTYLEFLAGS@
     
    128109AUX_DIR = @AUX_DIR@
    129110AWK = @AWK@
    130 BCPDOCDIR = @BCPDOCDIR@
    131 BCPOBJDIR = @BCPOBJDIR@
    132 BCPSRCDIR = @BCPSRCDIR@
     111BCP_CFLAGS = @BCP_CFLAGS@
     112BCP_DATA = @BCP_DATA@
     113BCP_LIBS = @BCP_LIBS@
     114BONMINLIB_CFLAGS = @BONMINLIB_CFLAGS@
     115BONMINLIB_LIBS = @BONMINLIB_LIBS@
     116BONMINLIB_PCLIBS = @BONMINLIB_PCLIBS@
     117BONMINLIB_PCREQUIRES = @BONMINLIB_PCREQUIRES@
     118BONMIN_SVN_REV = @BONMIN_SVN_REV@
    133119BUILDTOOLSDIR = @BUILDTOOLSDIR@
    134120BUILD_FP_FALSE = @BUILD_FP_FALSE@
    135121BUILD_FP_TRUE = @BUILD_FP_TRUE@
    136 CBCDOCDIR = @CBCDOCDIR@
    137 CBCOBJDIR = @CBCOBJDIR@
    138 CBCSRCDIR = @CBCSRCDIR@
    139122CC = @CC@
    140123CCDEPMODE = @CCDEPMODE@
    141124CDEFS = @CDEFS@
    142125CFLAGS = @CFLAGS@
    143 CGLDOCDIR = @CGLDOCDIR@
    144 CGLOBJDIR = @CGLOBJDIR@
    145 CGLSRCDIR = @CGLSRCDIR@
    146 CLPDOCDIR = @CLPDOCDIR@
    147 CLPOBJDIR = @CLPOBJDIR@
    148 CLPSRCDIR = @CLPSRCDIR@
    149 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    150 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    151 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    152 COIN_BUILD_GLPK_FALSE = @COIN_BUILD_GLPK_FALSE@
    153 COIN_BUILD_GLPK_TRUE = @COIN_BUILD_GLPK_TRUE@
     126COINDEPEND_CFLAGS = @COINDEPEND_CFLAGS@
     127COINDEPEND_DATA = @COINDEPEND_DATA@
     128COINDEPEND_LIBS = @COINDEPEND_LIBS@
    154129COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    155130COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
    156131COIN_HAS_BCP_FALSE = @COIN_HAS_BCP_FALSE@
    157132COIN_HAS_BCP_TRUE = @COIN_HAS_BCP_TRUE@
    158 COIN_HAS_CBC_FALSE = @COIN_HAS_CBC_FALSE@
    159 COIN_HAS_CBC_TRUE = @COIN_HAS_CBC_TRUE@
    160 COIN_HAS_CGL_FALSE = @COIN_HAS_CGL_FALSE@
    161 COIN_HAS_CGL_TRUE = @COIN_HAS_CGL_TRUE@
    162 COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    163 COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    164 COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    165 COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    166 COIN_HAS_COUENNE_FALSE = @COIN_HAS_COUENNE_FALSE@
    167 COIN_HAS_COUENNE_TRUE = @COIN_HAS_COUENNE_TRUE@
     133COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
     134COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
    168135COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    169136COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
    170 COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    171 COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
    172137COIN_HAS_FILTERSQP_FALSE = @COIN_HAS_FILTERSQP_FALSE@
    173138COIN_HAS_FILTERSQP_TRUE = @COIN_HAS_FILTERSQP_TRUE@
    174 COIN_HAS_FMP_FALSE = @COIN_HAS_FMP_FALSE@
    175 COIN_HAS_FMP_TRUE = @COIN_HAS_FMP_TRUE@
    176 COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
    177 COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
    178 COIN_HAS_IPOPT_FALSE = @COIN_HAS_IPOPT_FALSE@
    179 COIN_HAS_IPOPT_TRUE = @COIN_HAS_IPOPT_TRUE@
    180 COIN_HAS_MSK_FALSE = @COIN_HAS_MSK_FALSE@
    181 COIN_HAS_MSK_TRUE = @COIN_HAS_MSK_TRUE@
    182 COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
    183 COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    184 COIN_HAS_OSL_FALSE = @COIN_HAS_OSL_FALSE@
    185 COIN_HAS_OSL_TRUE = @COIN_HAS_OSL_TRUE@
    186 COIN_HAS_SPX_FALSE = @COIN_HAS_SPX_FALSE@
    187 COIN_HAS_SPX_TRUE = @COIN_HAS_SPX_TRUE@
    188 COIN_HAS_SYM_FALSE = @COIN_HAS_SYM_FALSE@
    189 COIN_HAS_SYM_TRUE = @COIN_HAS_SYM_TRUE@
    190 COIN_HAS_VOL_FALSE = @COIN_HAS_VOL_FALSE@
    191 COIN_HAS_VOL_TRUE = @COIN_HAS_VOL_TRUE@
    192 COIN_HAS_XPR_FALSE = @COIN_HAS_XPR_FALSE@
    193 COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
     139COIN_HAS_OSICPX_FALSE = @COIN_HAS_OSICPX_FALSE@
     140COIN_HAS_OSICPX_TRUE = @COIN_HAS_OSICPX_TRUE@
     141COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     142COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     143COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     144COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    194145COMPILE_BONMINBCP_FALSE = @COMPILE_BONMINBCP_FALSE@
    195146COMPILE_BONMINBCP_TRUE = @COMPILE_BONMINBCP_TRUE@
    196 COUENNEDOCDIR = @COUENNEDOCDIR@
    197 COUENNEOBJDIR = @COUENNEOBJDIR@
    198 COUENNESRCDIR = @COUENNESRCDIR@
    199147CPP = @CPP@
    200148CPPFLAGS = @CPPFLAGS@
     
    212160DEFS = @DEFS@
    213161DEPDIR = @DEPDIR@
    214 DYLPDOCDIR = @DYLPDOCDIR@
    215 DYLPOBJDIR = @DYLPOBJDIR@
    216 DYLPSRCDIR = @DYLPSRCDIR@
    217162ECHO = @ECHO@
    218163ECHO_C = @ECHO_C@
     
    224169FADDLIBS = @FADDLIBS@
    225170FFLAGS = @FFLAGS@
    226 FILTERSQPLIBADD = @FILTERSQPLIBADD@
     171FILTERSQP_CFLAGS = @FILTERSQP_CFLAGS@
     172FILTERSQP_DATA = @FILTERSQP_DATA@
     173FILTERSQP_LIBS = @FILTERSQP_LIBS@
    227174FLIBS = @FLIBS@
    228 FMPINCDIR = @FMPINCDIR@
    229 FMPLIB = @FMPLIB@
    230 GLPKINCDIR = @GLPKINCDIR@
    231 GLPKLIB = @GLPKLIB@
    232 GLPKOBJDIR = @GLPKOBJDIR@
    233175HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    234176HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    237179INSTALL_SCRIPT = @INSTALL_SCRIPT@
    238180INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    239 IPOPTDOCDIR = @IPOPTDOCDIR@
    240 IPOPTOBJDIR = @IPOPTOBJDIR@
    241 IPOPTSRCDIR = @IPOPTSRCDIR@
    242181LDFLAGS = @LDFLAGS@
    243182LIBEXT = @LIBEXT@
    244183LIBOBJS = @LIBOBJS@
    245 LIBS = @LIBS@ `cat \
    246         $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt`
     184LIBS = @LIBS@
    247185LIBTOOL = @LIBTOOL@
    248186LIBTOOLM4 = @LIBTOOLM4@
     
    257195MPICXX = @MPICXX@
    258196MPIF77 = @MPIF77@
    259 MSKINCDIR = @MSKINCDIR@
    260 MSKLIB = @MSKLIB@
    261197OBJEXT = @OBJEXT@
    262198OPT_CFLAGS = @OPT_CFLAGS@
    263199OPT_CXXFLAGS = @OPT_CXXFLAGS@
    264200OPT_FFLAGS = @OPT_FFLAGS@
    265 OSIDOCDIR = @OSIDOCDIR@
    266 OSIOBJDIR = @OSIOBJDIR@
    267 OSISRCDIR = @OSISRCDIR@
    268 OSLINCDIR = @OSLINCDIR@
    269 OSLLIB = @OSLLIB@
     201OSICPX_CFLAGS = @OSICPX_CFLAGS@
     202OSICPX_DATA = @OSICPX_DATA@
     203OSICPX_LIBS = @OSICPX_LIBS@
    270204PACKAGE = @PACKAGE@
    271205PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    275209PACKAGE_VERSION = @PACKAGE_VERSION@
    276210PATH_SEPARATOR = @PATH_SEPARATOR@
     211PCADDLIBS = @PCADDLIBS@
     212PKG_CONFIG = @PKG_CONFIG@
    277213RANLIB = @RANLIB@
    278214RPATH_FLAGS = @RPATH_FLAGS@
    279215SET_MAKE = @SET_MAKE@
    280216SHELL = @SHELL@
    281 SPXINCDIR = @SPXINCDIR@
    282 SPXLIB = @SPXLIB@
    283217STRIP = @STRIP@
    284 SYMDOCDIR = @SYMDOCDIR@
    285 SYMOBJDIR = @SYMOBJDIR@
    286 SYMSRCDIR = @SYMSRCDIR@
    287218VERSION = @VERSION@
    288 VOLDOCDIR = @VOLDOCDIR@
    289 VOLOBJDIR = @VOLOBJDIR@
    290 VOLSRCDIR = @VOLSRCDIR@
    291219VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    292 XPRINCDIR = @XPRINCDIR@
    293 XPRLIB = @XPRLIB@
    294220abs_bin_dir = @abs_bin_dir@
    295221abs_include_dir = @abs_include_dir@
     
    304230ac_ct_STRIP = @ac_ct_STRIP@
    305231ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     232ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    306233am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    307234am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    324251have_automake = @have_automake@
    325252have_svn = @have_svn@
     253have_svnversion = @have_svnversion@
    326254host = @host@
    327255host_alias = @host_alias@
     
    346274target_alias = @target_alias@
    347275AUTOMAKE_OPTIONS = foreign
    348 COINLIBS = $(CBCOBJDIR)/src/libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    349         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    350         $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    351         $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__append_1)
    352 IPOPTLIBS = \
    353         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    354 
    355276
    356277# Here list all include flags, relative to this "srcdir" directory.  This
    357278# "cygpath" stuff is necessary to compile with native compilers on Windows
    358 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../../src/OaAlgorithms` \
     279AM_CPPFLAGS = $(BONMINLIB_CFLAGS) \
     280        -I`$(CYGPATH_W) $(srcdir)/../../src/OaAlgorithms` \
    359281        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces` \
    360282        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ipopt` \
    361283        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
    362         -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` -I`$(CYGPATH_W) \
    363         $(IPOPTOBJDIR)/inc` -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    364         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` -I`$(CYGPATH_W) \
    365         $(IPOPTSRCDIR)/src/LinAlg` -I`$(CYGPATH_W) \
    366         $(IPOPTSRCDIR)/src/Apps/AmplSolver` -I`$(CYGPATH_W) \
    367         $(OSISRCDIR)/src` -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    368         -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` -I`$(CYGPATH_W) \
    369         $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
    370         $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    371         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` -I`$(CYGPATH_W) \
    372         $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) \
    373         $(OSISRCDIR)/src/OsiCbc` -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    374         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
    375         $(CGLSRCDIR)/src/CglProbing` -I`$(CYGPATH_W) \
    376         $(CGLSRCDIR)/src/CglOddHole` -I`$(CYGPATH_W) \
    377         $(CGLSRCDIR)/src/CglClique` -I`$(CYGPATH_W) \
    378         $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
    379         $(CGLSRCDIR)/src/CglMixedIntegerRounding` -I`$(CYGPATH_W) \
    380         $(CGLSRCDIR)/src/CglTwomir` -I`$(CYGPATH_W) \
    381         $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
    382         $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    383         $(CGLSRCDIR)/src` $(am__append_2)
     284        -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin`
     285
     286
     287# The following is a trick to get the source code of Cbc/Samples correctly in
     288# here, and also to get a link to libCbc into this directory (so that it
     289# is made)
     290#CbcCompareUser.cpp: $(CBCSRCDIR)/examples/CbcCompareUser.cpp
     291#       rm -f $@
     292#       $(LN_S) $< $@
     293
     294#CbcBranchUser.cpp: $(CBCSRCDIR)/examples/CbcBranchUser.cpp
     295#       rm -f $@
     296#       $(LN_S) $< $@
    384297
    385298########################################################################
     
    388301oa_fp_SOURCES = OAFeasibilityPump.cpp FP.cpp FP.hpp
    389302oa_fp_LDADD = \
    390         ../../src/CbcBonmin/libbonmin.la \
    391303        ../../src/Interfaces/Ampl/libamplinterface.la \
    392         $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    393         $(IPOPTLIBS) \
    394         $(LIBCBCCOPY) \
    395         $(COINLIBS) \
    396         $(ASLLIB) \
    397         $(ADDLIBS)
     304        ../../src/CbcBonmin/libbonmin.la \
     305        $(ASL_LIBS) \
     306        $(BONMINLIB_LIBS)
    398307
    399308
     
    402311# libraries.
    403312oa_fp_LDFLAGS = -rpath $(libdir)
    404 
    405 ########################################################################
    406 #                         make distclean stuff                         #
    407 ########################################################################
    408 CLEANFILES = $(LIBCBCCOPY)
    409 DISTCLEANFILES = \
    410         CbcCompareUser.cpp CbcBranchUser.cpp
    411 
    412313all: all-am
    413314
     
    614515
    615516clean-generic:
    616         -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
    617517
    618518distclean-generic:
    619519        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    620         -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
    621520
    622521maintainer-clean-generic:
     
    686585
    687586
    688 # The following is a trick to get the source code of Cbc/Samples correctly in
    689 # here, and also to get a link to libCbc into this directory (so that it
    690 # is made)
    691 CbcCompareUser.cpp: $(CBCSRCDIR)/examples/CbcCompareUser.cpp
    692         rm -f $@
    693         $(LN_S) $< $@
    694 
    695 CbcBranchUser.cpp: $(CBCSRCDIR)/examples//CbcBranchUser.cpp
    696         rm -f $@
    697         $(LN_S) $< $@
     587########################################################################
     588#                         make distclean stuff                         #
     589########################################################################
     590
     591#CLEANFILES = $(LIBCBCCOPY)
     592
     593#DISTCLEANFILES = \
     594#       CbcCompareUser.cpp CbcBranchUser.cpp
    698595# Tell versions [3.59,3.63) of GNU make to not export all variables.
    699596# Otherwise a system limit (for SysV at least) may be exceeded.
  • branches/split/Bonmin/experimental/Separable/BonHeuristicInnerApproximation.cpp

    r1712 r1743  
    2121#endif
    2222
    23 #ifdef COIN_HAS_CLP
    2423#include "OsiClpSolverInterface.hpp"
    25 #endif
    2624
    2725#include "OsiAuxInfo.hpp"
  • branches/split/Bonmin/experimental/Separable/Makefile.am

    r1678 r1743  
    1111# What is done in this directory:
    1212
    13 
    14   bin_PROGRAMS = sepa
    15 
    16 
    17 COINLIBS = \
    18         $(CBCOBJDIR)/src/libCbc.la \
    19         $(CGLOBJDIR)/src/libCgl.la \
    20         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la
    21 
    22 if COIN_HAS_CPX
    23   COINLIBS += \
    24         $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la \
    25         $(CPXLIB)
    26 endif
    27 
    28 
    29 COINLIBS += \
    30         $(OSIOBJDIR)/src/libOsi.la \
    31         $(CLPOBJDIR)/src/libClp.la \
    32         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    33 
    34 IPOPTLIBS = \
    35         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    36 
    37 LIBS += `cat $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt`
    38 LIBS += `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
     13bin_PROGRAMS = sepa
    3914
    4015# Here list all include flags, relative to this "srcdir" directory.  This
    4116# "cygpath" stuff is necessary to compile with native compilers on Windows
    42 AM_CPPFLAGS = \
     17AM_CPPFLAGS = $(BONMINLIB_CFLAGS) $(ASL_CFLAGS) \
    4318        -I`$(CYGPATH_W) $(srcdir)/../../src/Apps` \
    4419        -I`$(CYGPATH_W) $(srcdir)/../../src/Algorithms` \
     
    5025        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
    5126        -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` \
    52         -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin/Heuristics` \
    53         -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    54         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    55         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` \
    56         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg` \
    57         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Apps/AmplSolver` \
    58         -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    59         -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    60         -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    61         -I`$(CYGPATH_W) $(CBCSRCDIR)/examples` \
    62         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    63         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    64         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    65         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    66         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    67         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`\
    68         -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    69         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglGomory` \
    70         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglProbing` \
    71         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglOddHole` \
    72         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    73         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` \
    74         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglMixedIntegerRounding` \
    75         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
    76         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglKnapsackCover` \
    77         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglPreProcess` \
    78         -I`$(CYGPATH_W) $(CGLSRCDIR)/src`
    79 
    80 if COIN_HAS_CPX
    81   AM_CPPFLAGS += \
    82         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    83         -I`$(CYGPATH_W) $(CPXINCDIR)`
    84 endif
     27        -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin/Heuristics`
    8528
    8629########################################################################
     
    8932
    9033sepa_SOURCES = Sepa.cpp \
    91                 SepaSetup.cpp SepaSetup.hpp \
    92                 BonHeuristicInnerApproximation.hpp \
    93                 BonHeuristicInnerApproximation.cpp \
    94                 BonOuterDescription.cpp \
    95                 BonOuterDescription.hpp
     34               SepaSetup.cpp SepaSetup.hpp \
     35               BonHeuristicInnerApproximation.hpp \
     36               BonHeuristicInnerApproximation.cpp \
     37               BonOuterDescription.cpp \
     38               BonOuterDescription.hpp
    9639
    9740sepa_LDADD = \
    98         ../../src/CbcBonmin/libbonminampl.la \
    99         ../../src/CbcBonmin/libbonmin.la \
    100         $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    101         $(IPOPTLIBS) \
    102         $(COINLIBS) \
    103         $(ASLLIB) \
    104         $(ADDLIBS)
    105 
     41        ../../src/Interfaces/Ampl/libbonamplinterface.la \
     42        ../../src/CbcBonmin/libbonmin.la \
     43        $(ASL_LIBS) \
     44        $(BONMINLIB_LIBS)
    10645
    10746# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    11756
    11857DISTCLEANFILES =
    119 
  • branches/split/Bonmin/experimental/Separable/Makefile.in

    r1733 r1743  
    4444host_triplet = @host@
    4545bin_PROGRAMS = sepa$(EXEEXT)
    46 @COIN_HAS_CPX_TRUE@am__append_1 = \
    47 @COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la \
    48 @COIN_HAS_CPX_TRUE@     $(CPXLIB)
    49 
    50 @COIN_HAS_CPX_TRUE@am__append_2 = \
    51 @COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    52 @COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(CPXINCDIR)`
    53 
    5446subdir = experimental/Separable
    5547DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    6961        BonOuterDescription.$(OBJEXT)
    7062sepa_OBJECTS = $(am_sepa_OBJECTS)
    71 am__DEPENDENCIES_1 = $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    72 am__DEPENDENCIES_2 =
    73 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_3 =  \
    74 @COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la \
    75 @COIN_HAS_CPX_TRUE@     $(am__DEPENDENCIES_2)
    76 am__DEPENDENCIES_4 = $(CBCOBJDIR)/src/libCbc.la \
    77         $(CGLOBJDIR)/src/libCgl.la \
    78         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la $(am__DEPENDENCIES_3) \
    79         $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    80         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    81 sepa_DEPENDENCIES = ../../src/CbcBonmin/libbonminampl.la \
    82         ../../src/CbcBonmin/libbonmin.la \
    83         $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    84         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
    85         $(am__DEPENDENCIES_2)
     63am__DEPENDENCIES_1 =
     64sepa_DEPENDENCIES = ../../src/Interfaces/Ampl/libbonamplinterface.la \
     65        ../../src/CbcBonmin/libbonmin.la $(am__DEPENDENCIES_1) \
     66        $(am__DEPENDENCIES_1)
    8667DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    8768depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    203184LIBEXT = @LIBEXT@
    204185LIBOBJS = @LIBOBJS@
    205 LIBS = @LIBS@ `cat \
    206         $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` `cat \
    207         $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
     186LIBS = @LIBS@
    208187LIBTOOL = @LIBTOOL@
    209188LIBTOOLM4 = @LIBTOOLM4@
     
    297276target_alias = @target_alias@
    298277AUTOMAKE_OPTIONS = foreign
    299 COINLIBS = $(CBCOBJDIR)/src/libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    300         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la $(am__append_1) \
    301         $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    302         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    303 IPOPTLIBS = \
    304         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    305 
    306278
    307279# Here list all include flags, relative to this "srcdir" directory.  This
    308280# "cygpath" stuff is necessary to compile with native compilers on Windows
    309 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../../src/Apps` \
     281AM_CPPFLAGS = $(BONMINLIB_CFLAGS) $(ASL_CFLAGS) \
     282        -I`$(CYGPATH_W) $(srcdir)/../../src/Apps` \
    310283        -I`$(CYGPATH_W) $(srcdir)/../../src/Algorithms` \
    311284        -I`$(CYGPATH_W) $(srcdir)/../../src/Algorithms/Branching` \
     
    315288        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ipopt` \
    316289        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
    317         -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` -I`$(CYGPATH_W) \
    318         $(srcdir)/../../src/CbcBonmin/Heuristics` -I`$(CYGPATH_W) \
    319         $(IPOPTOBJDIR)/inc` -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    320         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` -I`$(CYGPATH_W) \
    321         $(IPOPTSRCDIR)/src/LinAlg` -I`$(CYGPATH_W) \
    322         $(IPOPTSRCDIR)/src/Apps/AmplSolver` -I`$(CYGPATH_W) \
    323         $(OSISRCDIR)/src` -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    324         -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` -I`$(CYGPATH_W) \
    325         $(CBCSRCDIR)/examples` -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    326         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) \
    327         $(CLPOBJDIR)/inc` -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    328         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) \
    329         $(OSISRCDIR)/src/OsiCbc` -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    330         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
    331         $(CGLSRCDIR)/src/CglProbing` -I`$(CYGPATH_W) \
    332         $(CGLSRCDIR)/src/CglOddHole` -I`$(CYGPATH_W) \
    333         $(CGLSRCDIR)/src/CglClique` -I`$(CYGPATH_W) \
    334         $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
    335         $(CGLSRCDIR)/src/CglMixedIntegerRounding` -I`$(CYGPATH_W) \
    336         $(CGLSRCDIR)/src/CglTwomir` -I`$(CYGPATH_W) \
    337         $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
    338         $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    339         $(CGLSRCDIR)/src` $(am__append_2)
     290        -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` \
     291        -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin/Heuristics`
     292
    340293
    341294########################################################################
     
    343296########################################################################
    344297sepa_SOURCES = Sepa.cpp \
    345                 SepaSetup.cpp SepaSetup.hpp \
    346                 BonHeuristicInnerApproximation.hpp \
    347                 BonHeuristicInnerApproximation.cpp \
    348                 BonOuterDescription.cpp \
    349                 BonOuterDescription.hpp
     298               SepaSetup.cpp SepaSetup.hpp \
     299               BonHeuristicInnerApproximation.hpp \
     300               BonHeuristicInnerApproximation.cpp \
     301               BonOuterDescription.cpp \
     302               BonOuterDescription.hpp
    350303
    351304sepa_LDADD = \
    352         ../../src/CbcBonmin/libbonminampl.la \
    353         ../../src/CbcBonmin/libbonmin.la \
    354         $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    355         $(IPOPTLIBS) \
    356         $(COINLIBS) \
    357         $(ASLLIB) \
    358         $(ADDLIBS)
     305        ../../src/Interfaces/Ampl/libbonamplinterface.la \
     306        ../../src/CbcBonmin/libbonmin.la \
     307        $(ASL_LIBS) \
     308        $(BONMINLIB_LIBS)
    359309
    360310
  • branches/split/Bonmin/experimental/Separable/Sepa.cpp

    r1675 r1743  
    3030           <<BONMIN_VERSION;
    3131  std::cout<<" using Cbc "
    32          <<CBCVERSION;
     32         <<CBC_VERSION;
    3333  std::cout<<" and Ipopt "
    3434         <<IPOPT_VERSION<<std::endl;
Note: See TracChangeset for help on using the changeset viewer.