Changeset 415 for branches


Ignore:
Timestamp:
Jul 15, 2006 1:15:32 PM (13 years ago)
Author:
forrest
Message:

for CbcCbcparam?.cpp

Location:
branches/devel/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/configure.ac

    r406 r415  
    9191esac
    9292
    93 # Steal some files from Clp - they are going to be deleted by a
    94 # distclean in src (see the Makefile.am there)
    95 if test x"$coin_has_clp" != xunavailable; then
    96   AC_MSG_NOTICE([Stealing CbcOrClpParam's files from Clp])
    97   AC_CONFIG_LINKS([src/CbcOrClpParam.cpp:../Clp/src/CbcOrClpParam.cpp
    98                    src/CbcOrClpParam.hpp:../Clp/src/CbcOrClpParam.hpp])
    99 fi
    100 
    10193#############################################################################
    10294#                            Third party solvers                            #
  • branches/devel/Cbc/src/Makefile.in

    r408 r415  
    151151binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    152152PROGRAMS = $(bin_PROGRAMS)
    153 am__cbc_SOURCES_DIST = CoinSolve.cpp unitTestClp.cpp Cbc_ampl.cpp \
    154         Cbc_ampl.h
     153am__cbc_SOURCES_DIST = CoinSolve.cpp CbcCbcParam.cpp unitTestClp.cpp \
     154        Cbc_ampl.cpp Cbc_ampl.h
    155155@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__objects_1 =  \
    156156@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  Cbc_ampl.$(OBJEXT)
    157157@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)
    160 cbc_OBJECTS = $(am_cbc_OBJECTS) $(nodist_cbc_OBJECTS)
     158@COIN_HAS_CLP_TRUE@     CbcCbcParam.$(OBJEXT) unitTestClp.$(OBJEXT) \
     159@COIN_HAS_CLP_TRUE@     $(am__objects_1)
     160cbc_OBJECTS = $(am_cbc_OBJECTS)
    161161am__DEPENDENCIES_1 =
    162162@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_2 =  \
     
    170170@COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_2)
    171171am_cbc_generic_OBJECTS = CbcMain.$(OBJEXT) CbcParam.$(OBJEXT) \
    172         unitTest.$(OBJEXT)
    173 nodist_cbc_generic_OBJECTS = CbcOrClpParam.$(OBJEXT)
    174 cbc_generic_OBJECTS = $(am_cbc_generic_OBJECTS) \
    175         $(nodist_cbc_generic_OBJECTS)
     172        CbcCbcParam.$(OBJEXT) unitTest.$(OBJEXT)
     173cbc_generic_OBJECTS = $(am_cbc_generic_OBJECTS)
    176174@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 =  \
    177175@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     
    227225LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    228226        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    229 SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) $(nodist_cbc_SOURCES) \
    230         $(cbc_generic_SOURCES) $(nodist_cbc_generic_SOURCES)
     227SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) $(cbc_generic_SOURCES)
    231228DIST_SOURCES = $(libCbc_la_SOURCES) $(am__cbc_SOURCES_DIST) \
    232229        $(cbc_generic_SOURCES)
     
    477474        CbcMain.cpp \
    478475        CbcParam.cpp CbcParam.hpp \
     476        CbcCbcParam.cpp \
    479477        unitTest.cpp
    480478
    481 
    482 # The following file is not to be distributed, since it is "borrowed" from Clp
    483 nodist_cbc_generic_SOURCES = CbcOrClpParam.cpp
    484479
    485480# Finally the Osi Coin library (many of the above need it)
     
    530525
    531526# List all source files for this executable, including headers
    532 @COIN_HAS_CLP_TRUE@cbc_SOURCES = CoinSolve.cpp unitTestClp.cpp \
    533 @COIN_HAS_CLP_TRUE@     $(am__append_28)
    534 
    535 # The following file is not to be distributed, since it is "borrowed" from Clp
    536 @COIN_HAS_CLP_TRUE@nodist_cbc_SOURCES = CbcOrClpParam.cpp
     527@COIN_HAS_CLP_TRUE@cbc_SOURCES = CoinSolve.cpp CbcCbcParam.cpp \
     528@COIN_HAS_CLP_TRUE@     unitTestClp.cpp $(am__append_28)
    537529
    538530# Additional COIN libraries
     
    697689@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcBranchDynamic.Plo@am__quote@
    698690@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcBranchLotsize.Plo@am__quote@
     691@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCbcParam.Po@am__quote@
    699692@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareActual.Plo@am__quote@
    700693@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCountRowCut.Plo@am__quote@
     
    711704@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcModel.Plo@am__quote@
    712705@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNode.Plo@am__quote@
    713 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcOrClpParam.Po@am__quote@
    714706@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcParam.Po@am__quote@
    715707@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcStatistics.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.