Ignore:
Timestamp:
Jul 10, 2006 2:52:52 PM (13 years ago)
Author:
andreasw
Message:

updated according to changes in BuildTools?; included some bugfixes provided by Lou Hafer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Makefile.in

    r398 r405  
    4545build_triplet = @build@
    4646host_triplet = @host@
    47 bin_PROGRAMS = cbc-generic$(EXEEXT) cbc$(EXEEXT)
     47bin_PROGRAMS = cbc-generic$(EXEEXT) $(am__EXEEXT_1)
    4848
    4949# List all additionally required solver and Osi libraries
     
    106106@COIN_HAS_XPR_TRUE@am__append_26 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    107107
     108########################################################################
     109#                            cbc program                               #
     110########################################################################
     111
     112# Name of the executable compiled in this directory.  We want it to be
     113# installed in the 'bin' directory
     114@COIN_HAS_CLP_TRUE@am__append_27 = cbc
     115
    108116# If we have the Ampl solver library, we need to add additional things
    109 @COIN_HAS_ASL_TRUE@am__append_27 = Cbc_ampl.cpp Cbc_ampl.h
    110 @COIN_HAS_ASL_TRUE@am__append_28 = $(ASLLIB)
    111 @COIN_HAS_ASL_TRUE@am__append_29 = $(ASL_CPPFLAGS)
     117@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_28 = Cbc_ampl.cpp Cbc_ampl.h
     118@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_29 = $(ASLLIB)
     119@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_30 = $(ASL_CPPFLAGS)
    112120subdir = src
    113121DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     
    140148        CbcStatistics.lo CbcStrategy.lo CbcTree.lo CbcTreeLocal.lo
    141149libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
     150@COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
    142151binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    143152PROGRAMS = $(bin_PROGRAMS)
    144153am__cbc_SOURCES_DIST = CoinSolve.cpp unitTestClp.cpp Cbc_ampl.cpp \
    145154        Cbc_ampl.h
    146 @COIN_HAS_ASL_TRUE@am__objects_1 = Cbc_ampl.$(OBJEXT)
    147 am_cbc_OBJECTS = CoinSolve.$(OBJEXT) unitTestClp.$(OBJEXT) \
    148         $(am__objects_1)
    149 nodist_cbc_OBJECTS = CbcOrClpParam.$(OBJEXT)
     155@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__objects_1 =  \
     156@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  Cbc_ampl.$(OBJEXT)
     157@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT) \
     158@COIN_HAS_CLP_TRUE@     unitTestClp.$(OBJEXT) $(am__objects_1)
     159@COIN_HAS_CLP_TRUE@nodist_cbc_OBJECTS = CbcOrClpParam.$(OBJEXT)
    150160cbc_OBJECTS = $(am_cbc_OBJECTS) $(nodist_cbc_OBJECTS)
    151161am__DEPENDENCIES_1 =
    152 @COIN_HAS_ASL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
    153 cbc_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    154         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    155         $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    156         $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__DEPENDENCIES_2)
     162@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_2 =  \
     163@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  $(am__DEPENDENCIES_1)
     164@COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbc.la \
     165@COIN_HAS_CLP_TRUE@     $(CGLOBJDIR)/src/libCgl.la \
     166@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     167@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/libOsi.la \
     168@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la \
     169@COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
     170@COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_2)
    157171am_cbc_generic_OBJECTS = CbcMain.$(OBJEXT) CbcParam.$(OBJEXT) \
    158172        unitTest.$(OBJEXT)
     
    252266COINUTILSOBJDIR = @COINUTILSOBJDIR@
    253267COINUTILSSRCDIR = @COINUTILSSRCDIR@
    254 COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    255 COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
    256268COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    257269COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
     
    296308CXXFLAGS = @CXXFLAGS@
    297309CYGPATH_W = @CYGPATH_W@
     310DBG_CFLAGS = @DBG_CFLAGS@
     311DBG_CXXFLAGS = @DBG_CXXFLAGS@
    298312DEFS = @DEFS@
    299313DEPDIR = @DEPDIR@
     
    339353MSKLIB = @MSKLIB@
    340354OBJEXT = @OBJEXT@
     355OPT_CFLAGS = @OPT_CFLAGS@
     356OPT_CXXFLAGS = @OPT_CXXFLAGS@
    341357OSIOBJDIR = @OSIOBJDIR@
    342358OSISRCDIR = @OSISRCDIR@
     
    490506        $(am__append_11) $(am__append_13) $(am__append_15) \
    491507        $(am__append_17) $(am__append_19) $(am__append_22) \
    492         $(am__append_25) $(am__append_29) -I`$(CYGPATH_W) \
     508        $(am__append_25) $(am__append_30) -I`$(CYGPATH_W) \
    493509        $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    494510        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglDuplicateRow` \
     
    503519        $(CGLSRCDIR)/src/CglRedSplit` -I`$(CYGPATH_W) \
    504520        $(CGLSRCDIR)/src/CglTwomir` -I`$(CYGPATH_W) \
    505         $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    506         -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
     521        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
     522        $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
     523        -I`$(CYGPATH_W) $(OSIOBJDIR)/inc` -DCOIN_NO_CLP_MESSAGE \
     524        -DUSE_CBCCONFIG
    507525
    508526# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    512530
    513531# List all source files for this executable, including headers
    514 cbc_SOURCES = CoinSolve.cpp unitTestClp.cpp $(am__append_27)
     532@COIN_HAS_CLP_TRUE@cbc_SOURCES = CoinSolve.cpp unitTestClp.cpp \
     533@COIN_HAS_CLP_TRUE@     $(am__append_28)
    515534
    516535# The following file is not to be distributed, since it is "borrowed" from Clp
    517 nodist_cbc_SOURCES = CbcOrClpParam.cpp
     536@COIN_HAS_CLP_TRUE@nodist_cbc_SOURCES = CbcOrClpParam.cpp
    518537
    519538# Additional COIN libraries
    520 cbc_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    521         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    522         $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    523         $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__append_28)
     539@COIN_HAS_CLP_TRUE@cbc_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
     540@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     541@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/libOsi.la \
     542@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la \
     543@COIN_HAS_CLP_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
     544@COIN_HAS_CLP_TRUE@     $(am__append_29)
    524545
    525546# Finally, the -rpath flag is used by libtool to make sure that the shared
    526547# library is found (in the lib install directory) when we are using dynamic
    527548# libraries.
    528 cbc_LDFLAGS = -rpath $(libdir)
     549@COIN_HAS_CLP_TRUE@cbc_LDFLAGS = -rpath $(libdir)
    529550
    530551# This line is necessary to allow VPATH compilation with MS compilers
Note: See TracChangeset for help on using the changeset viewer.