Ignore:
Timestamp:
May 13, 2006 10:26:19 AM (13 years ago)
Author:
andreasw
Message:

renamed CoinBase? to CoinUtils?

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        33Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
        44Data/miplib3  https://www.coin-or.org/svn/Data/trunk/miplib3
        5 CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
         5CoinUtils     https://www.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        66Cgl           https://www.coin-or.org/svn/Cgl/trunk/Cgl
        77Clp           https://www.coin-or.org/svn/Clp/trunk/Clp
  • trunk/Cbc/src/Makefile.am

    r312 r313  
    4848
    4949########################################################################
    50 #                        cbc_solver program                            #
     50#                            cbc program                               #
    5151########################################################################
    5252
    5353# Name of the executable compiled in this directory.  We want it to be
    5454# installed in the 'bin' directory
    55 bin_PROGRAMS = cbc_solver
     55bin_PROGRAMS = cbc
    5656
    5757# List all source files for this executable, including headers
    58 cbc_solver_SOURCES = \
     58cbc_SOURCES = \
    5959        CbcMain.cpp \
    6060        CbcParam.cpp CbcParam.hpp \
     
    6262
    6363# The following file is not to be distributed, since it is "borrowed" from Clp
    64 nodist_cbc_solver_SOURCES = CbcOrClpParam.cpp
    65 
    66 cbc_solver_LDADD = libCbc.la \
     64nodist_cbc_SOURCES = CbcOrClpParam.cpp
     65
     66cbc_LDADD = libCbc.la \
    6767        $(CGLOBJDIR)/src/libCgl.la
    6868
     
    7272        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    7373        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    74   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     74  cbc_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    7575        $(CLPOBJDIR)/src/libClp.la
    7676  LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     
    8080  CXXFLAGS += -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    8181        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    82   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
     82  cbc_LDADD += $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    8383        $(CBCOBJDIR)/src/libCbc.la
    8484  LIBS += `cat $(CBCOBJDIR)/cbc_addlibs.txt`
     
    8888  CXXFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    8989        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    90   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     90  cbc_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    9191endif
    9292
     
    9494  CXXFLAGS += -I`$(CYGPATH_W) $(DYLPSRCDIR)/src` \
    9595        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    96   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     96  cbc_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    9797        $(DYLPOBJDIR)/src/libDylp.la
    9898  LIBS += `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
     
    101101if COIN_HAS_FMP
    102102  CXXFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    103   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     103  cbc_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    104104endif
    105105
     
    107107  CXXFLAGS += -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    108108        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    109   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     109  cbc_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    110110endif
    111111
     
    113113  CXXFLAGS += -I`$(CYGPATH_W) $(MSKINCDIR)` \
    114114        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    115   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
     115  cbc_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    116116endif
    117117
     
    119119  CXXFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
    120120        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    121   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
     121  cbc_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    122122endif
    123123
     
    125125  CXXFLAGS += -I`$(CYGPATH_W) $(SPXINCDIR)` \
    126126        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    127   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
     127  cbc_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    128128endif
    129129
     
    131131  CXXFLAGS += -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
    132132        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    133   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     133  cbc_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    134134        $(SYMOBJDIR)/src/libSym.la
    135135  LIBS += `cat $(SYMOBJDIR)/sym_addlibs.txt`
     
    139139  CXXFLAGS += -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    140140        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    141   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     141  cbc_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    142142        $(VOLOBJDIR)/src/libVol.la
    143143  LIBS += `cat $(VOLOBJDIR)/vol_addlibs.txt`
     
    147147  CXXFLAGS += -I`$(CYGPATH_W) $(XPRINCDIR)` \
    148148        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    149   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     149  cbc_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    150150endif
    151151
    152152# Finally the Osi Coin library (many of the above need it)
    153 cbc_solver_LDADD += $(OSIOBJDIR)/src/libOsi.la \
    154         $(COINBASEOBJDIR)/src/libCoinBase.la
    155 LIBS += `cat $(COINBASEOBJDIR)/coinbase_addlibs.txt` $(ADDLIBS)
     153cbc_LDADD += $(OSIOBJDIR)/src/libOsi.la \
     154        $(COINUTILSOBJDIR)/src/libCoinUtils.la
     155LIBS += `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    156156
    157157# Finally, the -rpath flag is used by libtool to make sure that the shared
    158158# library is found (in the lib install directory) when we are using dynamic
    159159# libraries.
    160 cbc_solver_LDFLAGS = -rpath $(libdir)
     160cbc_LDFLAGS = -rpath $(libdir)
    161161
    162162########################################################################
     
    185185        $(OSIOBJDIR)/src/libOsi.la \
    186186        $(CLPOBJDIR)/src/libClp.la \
    187         $(COINBASEOBJDIR)/src/libCoinBase.la
     187        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    188188
    189189# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    213213        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglRedSplit` \
    214214        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
    215         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     215        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    216216        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    217217
     
    272272CLEANFILES = bla.tmp
    273273
    274 DISTCLEANFILES = ../inc/$(CONFIG_DIST) \
    275         CbcOrClpParam.cpp \
    276         CbcOrClpParam.hpp
     274DISTCLEANFILES = ../inc/$(CONFIG_DIST)
Note: See TracChangeset for help on using the changeset viewer.