Changeset 372


Ignore:
Timestamp:
Jun 15, 2006 10:18:02 AM (13 years ago)
Author:
andreasw
Message:

renamed CBc executables

Location:
trunk/Cbc
Files:
4 edited

Legend:

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

    r369 r372  
    4949
    5050########################################################################
    51 #                            cbc program                               #
     51#                        cbc-generic program                           #
    5252########################################################################
    5353
    5454# Name of the executable compiled in this directory.  We want it to be
    5555# installed in the 'bin' directory
    56 bin_PROGRAMS = cbc
     56bin_PROGRAMS = cbc-generic
    5757
    5858# List all source files for this executable, including headers
    59 cbc_SOURCES = \
     59cbc_generic_SOURCES = \
    6060        CbcMain.cpp \
    6161        CbcParam.cpp CbcParam.hpp \
     
    6363
    6464# The following file is not to be distributed, since it is "borrowed" from Clp
    65 nodist_cbc_SOURCES = CbcOrClpParam.cpp
    66 
    67 cbc_LDADD = libCbc.la \
     65nodist_cbc_generic_SOURCES = CbcOrClpParam.cpp
     66
     67cbc_generic_LDADD = libCbc.la \
    6868        $(CGLOBJDIR)/src/libCgl.la \
    6969        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la
     
    7575        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    7676        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    77   cbc_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     77  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    7878        $(CLPOBJDIR)/src/libClp.la
    7979  LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     
    8383  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    8484        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    85   cbc_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     85  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    8686endif
    8787
     
    9191        -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
    9292        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    93   cbc_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     93  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    9494        $(DYLPOBJDIR)/src/Dylp/libDylp.la
    9595  LIBS += `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
     
    9898if COIN_HAS_FMP
    9999  AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    100   cbc_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     100  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    101101endif
    102102
     
    104104  AM_CPPFLAGS += -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    105105        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    106   cbc_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     106  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    107107endif
    108108
     
    110110  AM_CPPFLAGS += -I`$(CYGPATH_W) $(MSKINCDIR)` \
    111111        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    112   cbc_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
     112  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    113113endif
    114114
     
    116116  AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
    117117        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    118   cbc_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
     118  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    119119endif
    120120
     
    122122  AM_CPPFLAGS += -I`$(CYGPATH_W) $(SPXINCDIR)` \
    123123        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    124   cbc_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
     124  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    125125endif
    126126
     
    128128  AM_CPPFLAGS += -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
    129129        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    130   cbc_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     130  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    131131        $(SYMOBJDIR)/src/libSym.la
    132132  LIBS += `cat $(SYMOBJDIR)/sym_addlibs.txt`
     
    136136  AM_CPPFLAGS += -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    137137        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    138   cbc_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     138  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    139139        $(VOLOBJDIR)/src/libVol.la
    140140  LIBS += `cat $(VOLOBJDIR)/vol_addlibs.txt`
     
    144144  AM_CPPFLAGS += -I`$(CYGPATH_W) $(XPRINCDIR)` \
    145145        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    146   cbc_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     146  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    147147endif
    148148
    149149# Finally the Osi Coin library (many of the above need it)
    150 cbc_LDADD += $(OSIOBJDIR)/src/libOsi.la \
     150cbc_generic_LDADD += $(OSIOBJDIR)/src/libOsi.la \
    151151        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    152152LIBS += `cat $(OSIOBJDIR)/osi_addlibs.txt` \
     
    156156# library is found (in the lib install directory) when we are using dynamic
    157157# libraries.
    158 cbc_LDFLAGS = -rpath $(libdir)
    159 
    160 ########################################################################
    161 #                           solve program                              #
     158cbc_generic_LDFLAGS = -rpath $(libdir)
     159
     160########################################################################
     161#                            cbc program                               #
    162162########################################################################
    163163
    164164# Name of the executable compiled in this directory.  We want it to be
    165165# installed in the 'bin' directory
    166 bin_PROGRAMS += solve
     166bin_PROGRAMS += cbc
    167167
    168168# List all source files for this executable, including headers
    169 solve_SOURCES = \
     169cbc_SOURCES = \
    170170        CoinSolve.cpp \
    171171        unitTestClp.cpp
    172172
    173173# The following file is not to be distributed, since it is "borrowed" from Clp
    174 nodist_solve_SOURCES = CbcOrClpParam.cpp
     174nodist_cbc_SOURCES = CbcOrClpParam.cpp
    175175
    176176# Additional COIN libraries
    177 solve_LDADD = libCbc.la \
     177cbc_LDADD = libCbc.la \
    178178        $(CGLOBJDIR)/src/libCgl.la \
    179179        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     
    185185# library is found (in the lib install directory) when we are using dynamic
    186186# libraries.
    187 solve_LDFLAGS = -rpath $(libdir)
     187cbc_LDFLAGS = -rpath $(libdir)
    188188
    189189# If we have the Ampl solver library, we need to add additional things
    190190if COIN_HAS_ASL
    191 solve_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    192 solve_LDADD += $(ASLLIB)
     191cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
     192cbc_LDADD += $(ASLLIB)
    193193AM_CPPFLAGS += $(ASL_CPPFLAGS)
    194194endif
  • trunk/Cbc/src/Makefile.in

    r369 r372  
    4545build_triplet = @build@
    4646host_triplet = @host@
    47 bin_PROGRAMS = cbc$(EXEEXT) solve$(EXEEXT)
     47bin_PROGRAMS = cbc-generic$(EXEEXT) cbc$(EXEEXT)
    4848
    4949# List all additionally required solver and Osi libraries
     
    142142binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    143143PROGRAMS = $(bin_PROGRAMS)
    144 am_cbc_OBJECTS = CbcMain.$(OBJEXT) CbcParam.$(OBJEXT) \
    145         unitTest.$(OBJEXT)
     144am__cbc_SOURCES_DIST = CoinSolve.cpp unitTestClp.cpp Cbc_ampl.cpp \
     145        Cbc_ampl.h
     146@COIN_HAS_ASL_TRUE@am__objects_1 = Cbc_ampl.$(OBJEXT)
     147am_cbc_OBJECTS = CoinSolve.$(OBJEXT) unitTestClp.$(OBJEXT) \
     148        $(am__objects_1)
    146149nodist_cbc_OBJECTS = CbcOrClpParam.$(OBJEXT)
    147150cbc_OBJECTS = $(am_cbc_OBJECTS) $(nodist_cbc_OBJECTS)
    148 @COIN_HAS_CLP_TRUE@am__DEPENDENCIES_1 =  \
     151am__DEPENDENCIES_1 =
     152@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
     153cbc_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)
     157am_cbc_generic_OBJECTS = CbcMain.$(OBJEXT) CbcParam.$(OBJEXT) \
     158        unitTest.$(OBJEXT)
     159nodist_cbc_generic_OBJECTS = CbcOrClpParam.$(OBJEXT)
     160cbc_generic_OBJECTS = $(am_cbc_generic_OBJECTS) \
     161        $(nodist_cbc_generic_OBJECTS)
     162@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 =  \
    149163@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    150164@COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    151 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_2 =  \
     165@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_4 =  \
    152166@COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    153 @COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_3 =  \
     167@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_5 =  \
    154168@COIN_HAS_DYLP_TRUE@    $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    155169@COIN_HAS_DYLP_TRUE@    $(DYLPOBJDIR)/src/Dylp/libDylp.la
    156 @COIN_HAS_FMP_TRUE@am__DEPENDENCIES_4 =  \
     170@COIN_HAS_FMP_TRUE@am__DEPENDENCIES_6 =  \
    157171@COIN_HAS_FMP_TRUE@     $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    158 @COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_5 =  \
     172@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_7 =  \
    159173@COIN_HAS_GLPK_TRUE@    $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    160 @COIN_HAS_MSK_TRUE@am__DEPENDENCIES_6 =  \
     174@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_8 =  \
    161175@COIN_HAS_MSK_TRUE@     $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    162 @COIN_HAS_OSL_TRUE@am__DEPENDENCIES_7 =  \
     176@COIN_HAS_OSL_TRUE@am__DEPENDENCIES_9 =  \
    163177@COIN_HAS_OSL_TRUE@     $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    164 @COIN_HAS_SPX_TRUE@am__DEPENDENCIES_8 =  \
     178@COIN_HAS_SPX_TRUE@am__DEPENDENCIES_10 =  \
    165179@COIN_HAS_SPX_TRUE@     $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    166 @COIN_HAS_SYM_TRUE@am__DEPENDENCIES_9 =  \
     180@COIN_HAS_SYM_TRUE@am__DEPENDENCIES_11 =  \
    167181@COIN_HAS_SYM_TRUE@     $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    168182@COIN_HAS_SYM_TRUE@     $(SYMOBJDIR)/src/libSym.la
    169 @COIN_HAS_VOL_TRUE@am__DEPENDENCIES_10 =  \
     183@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_12 =  \
    170184@COIN_HAS_VOL_TRUE@     $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    171185@COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    172 @COIN_HAS_XPR_TRUE@am__DEPENDENCIES_11 =  \
     186@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_13 =  \
    173187@COIN_HAS_XPR_TRUE@     $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    174 cbc_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    175         $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__DEPENDENCIES_1) \
    176         $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
     188cbc_generic_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
     189        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__DEPENDENCIES_3) \
    177190        $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
    178191        $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
    179192        $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9) \
    180193        $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) \
     194        $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_13) \
    181195        $(OSIOBJDIR)/src/libOsi.la \
    182196        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    183 am__solve_SOURCES_DIST = CoinSolve.cpp unitTestClp.cpp Cbc_ampl.cpp \
    184         Cbc_ampl.h
    185 @COIN_HAS_ASL_TRUE@am__objects_1 = Cbc_ampl.$(OBJEXT)
    186 am_solve_OBJECTS = CoinSolve.$(OBJEXT) unitTestClp.$(OBJEXT) \
    187         $(am__objects_1)
    188 nodist_solve_OBJECTS = CbcOrClpParam.$(OBJEXT)
    189 solve_OBJECTS = $(am_solve_OBJECTS) $(nodist_solve_OBJECTS)
    190 am__DEPENDENCIES_12 =
    191 @COIN_HAS_ASL_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_12)
    192 solve_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    193         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    194         $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    195         $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__DEPENDENCIES_13)
    196197depcomp = $(SHELL) $(top_srcdir)/../depcomp
    197198am__depfiles_maybe = depfiles
     
    213214        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    214215SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) $(nodist_cbc_SOURCES) \
    215         $(solve_SOURCES) $(nodist_solve_SOURCES)
    216 DIST_SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) \
    217         $(am__solve_SOURCES_DIST)
     216        $(cbc_generic_SOURCES) $(nodist_cbc_generic_SOURCES)
     217DIST_SOURCES = $(libCbc_la_SOURCES) $(am__cbc_SOURCES_DIST) \
     218        $(cbc_generic_SOURCES)
    218219includeHEADERS_INSTALL = $(INSTALL_HEADER)
    219220HEADERS = $(include_HEADERS)
     
    453454
    454455# List all source files for this executable, including headers
    455 cbc_SOURCES = \
     456cbc_generic_SOURCES = \
    456457        CbcMain.cpp \
    457458        CbcParam.cpp CbcParam.hpp \
     
    460461
    461462# The following file is not to be distributed, since it is "borrowed" from Clp
    462 nodist_cbc_SOURCES = CbcOrClpParam.cpp
     463nodist_cbc_generic_SOURCES = CbcOrClpParam.cpp
    463464
    464465# Finally the Osi Coin library (many of the above need it)
    465 cbc_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
     466cbc_generic_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    466467        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la $(am__append_2) \
    467468        $(am__append_5) $(am__append_7) $(am__append_10) \
     
    504505# library is found (in the lib install directory) when we are using dynamic
    505506# libraries.
    506 cbc_LDFLAGS = -rpath $(libdir)
     507cbc_generic_LDFLAGS = -rpath $(libdir)
    507508
    508509# List all source files for this executable, including headers
    509 solve_SOURCES = CoinSolve.cpp unitTestClp.cpp $(am__append_27)
     510cbc_SOURCES = CoinSolve.cpp unitTestClp.cpp $(am__append_27)
    510511
    511512# The following file is not to be distributed, since it is "borrowed" from Clp
    512 nodist_solve_SOURCES = CbcOrClpParam.cpp
     513nodist_cbc_SOURCES = CbcOrClpParam.cpp
    513514
    514515# Additional COIN libraries
    515 solve_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
     516cbc_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    516517        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    517518        $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
     
    521522# library is found (in the lib install directory) when we are using dynamic
    522523# libraries.
    523 solve_LDFLAGS = -rpath $(libdir)
     524cbc_LDFLAGS = -rpath $(libdir)
    524525
    525526# This line is necessary to allow VPATH compilation with MS compilers
     
    654655        @rm -f cbc$(EXEEXT)
    655656        $(CXXLINK) $(cbc_LDFLAGS) $(cbc_OBJECTS) $(cbc_LDADD) $(LIBS)
    656 solve$(EXEEXT): $(solve_OBJECTS) $(solve_DEPENDENCIES)
    657         @rm -f solve$(EXEEXT)
    658         $(CXXLINK) $(solve_LDFLAGS) $(solve_OBJECTS) $(solve_LDADD) $(LIBS)
     657cbc-generic$(EXEEXT): $(cbc_generic_OBJECTS) $(cbc_generic_DEPENDENCIES)
     658        @rm -f cbc-generic$(EXEEXT)
     659        $(CXXLINK) $(cbc_generic_LDFLAGS) $(cbc_generic_OBJECTS) $(cbc_generic_LDADD) $(LIBS)
    659660
    660661mostlyclean-compile:
  • trunk/Cbc/test/Makefile.am

    r339 r372  
    1515# We are using the Cbc solver executable to do the unit test
    1616
    17 test: ../src/cbc$(EXEEXT) ../src/solve$(EXEEXT) $(extra_target)
     17test: ../src/cbc-generic$(EXEEXT) ../src/cbc$(EXEEXT)
    1818        cd ../../Data/Netlib; make uncompress
    1919        cd ../../Data/miplib3; make uncompress
    20         ../src/cbc$(EXEEXT) -miplib -unitTest
    21         ../src/solve$(EXEEXT) -unitTest -netlib
     20        ../src/cbc-generic$(EXEEXT) -miplib -unitTest
     21        ../src/cbc$(EXEEXT) -unitTest -netlib
    2222
    23 .PHONY: test example_files
     23.PHONY: test
    2424
    2525########################################################################
  • trunk/Cbc/test/Makefile.in

    r369 r372  
    419419# We are using the Cbc solver executable to do the unit test
    420420
    421 test: ../src/cbc$(EXEEXT) ../src/solve$(EXEEXT) $(extra_target)
     421test: ../src/cbc-generic$(EXEEXT) ../src/cbc$(EXEEXT)
    422422        cd ../../Data/Netlib; make uncompress
    423423        cd ../../Data/miplib3; make uncompress
    424         ../src/cbc$(EXEEXT) -miplib -unitTest
    425         ../src/solve$(EXEEXT) -unitTest -netlib
    426 
    427 .PHONY: test example_files
     424        ../src/cbc-generic$(EXEEXT) -miplib -unitTest
     425        ../src/cbc$(EXEEXT) -unitTest -netlib
     426
     427.PHONY: test
    428428# Tell versions [3.59,3.63) of GNU make to not export all variables.
    429429# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.