Ignore:
Timestamp:
Jan 26, 2013 9:00:13 PM (7 years ago)
Author:
stefan
Message:
  • add configure option --enable-aboca={1,2,3,4,yes,no}
  • compile Aboca source only if --enable-aboca set (instead of compiling empty source files)
  • fix svn properties
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        77Data/Netlib       https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
        88Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        9 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         9CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         10Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
  • trunk/Clp/src/Makefile.in

    r1878 r1910  
    4545build_triplet = @build@
    4646host_triplet = @host@
     47@COIN_HAS_ABC_TRUE@am__append_1 = \
     48@COIN_HAS_ABC_TRUE@     AbcCommon.hpp \
     49@COIN_HAS_ABC_TRUE@     AbcDualRowDantzig.cpp AbcDualRowDantzig.hpp \
     50@COIN_HAS_ABC_TRUE@     AbcDualRowPivot.cpp AbcDualRowPivot.hpp \
     51@COIN_HAS_ABC_TRUE@     AbcDualRowSteepest.cpp AbcDualRowSteepest.hpp \
     52@COIN_HAS_ABC_TRUE@     AbcMatrix.cpp AbcMatrix.hpp \
     53@COIN_HAS_ABC_TRUE@     AbcNonLinearCost.cpp AbcNonLinearCost.hpp \
     54@COIN_HAS_ABC_TRUE@     AbcPrimalColumnDantzig.cpp AbcPrimalColumnDantzig.hpp \
     55@COIN_HAS_ABC_TRUE@     AbcPrimalColumnPivot.cpp AbcPrimalColumnPivot.hpp \
     56@COIN_HAS_ABC_TRUE@     AbcPrimalColumnSteepest.cpp AbcPrimalColumnSteepest.hpp \
     57@COIN_HAS_ABC_TRUE@     AbcSimplex.cpp AbcSimplex.hpp \
     58@COIN_HAS_ABC_TRUE@     AbcSimplexDual.cpp AbcSimplexDual.hpp \
     59@COIN_HAS_ABC_TRUE@     AbcSimplexPrimal.cpp AbcSimplexPrimal.hpp \
     60@COIN_HAS_ABC_TRUE@     AbcSimplexParallel.cpp \
     61@COIN_HAS_ABC_TRUE@     AbcSimplexFactorization.cpp AbcSimplexFactorization.hpp \
     62@COIN_HAS_ABC_TRUE@     AbcWarmStart.cpp AbcWarmStart.hpp \
     63@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization.hpp \
     64@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization1.cpp \
     65@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization2.cpp \
     66@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization3.cpp \
     67@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization4.cpp \
     68@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization5.cpp \
     69@COIN_HAS_ABC_TRUE@     CoinAbcCommonFactorization.hpp \
     70@COIN_HAS_ABC_TRUE@     CoinAbcCommon.hpp \
     71@COIN_HAS_ABC_TRUE@     CoinAbcDenseFactorization.cpp \
     72@COIN_HAS_ABC_TRUE@     CoinAbcDenseFactorization.hpp \
     73@COIN_HAS_ABC_TRUE@     CoinAbcFactorization.hpp \
     74@COIN_HAS_ABC_TRUE@     CoinAbcFactorization1.cpp \
     75@COIN_HAS_ABC_TRUE@     CoinAbcFactorization2.cpp \
     76@COIN_HAS_ABC_TRUE@     CoinAbcFactorization3.cpp \
     77@COIN_HAS_ABC_TRUE@     CoinAbcFactorization4.cpp \
     78@COIN_HAS_ABC_TRUE@     CoinAbcFactorization5.cpp \
     79@COIN_HAS_ABC_TRUE@     CoinAbcHelperFunctions.cpp CoinAbcHelperFunctions.hpp \
     80@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization1.cpp \
     81@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization2.cpp \
     82@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization3.cpp \
     83@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization4.cpp \
     84@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization5.cpp \
     85@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization1.cpp \
     86@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization2.cpp \
     87@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization3.cpp \
     88@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization4.cpp \
     89@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization5.cpp
     90
    4791
    4892# if AMD, CHOLMOD, or GLPK is available, then compile ClpCholeskyUfl.cpp
    49 @COIN_HAS_AMD_TRUE@am__append_1 = ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
    50 @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@am__append_2 = ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
    51 @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__append_3 = ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
    52 @COIN_HAS_MUMPS_TRUE@am__append_4 = ClpCholeskyMumps.cpp ClpCholeskyMumps.hpp
    53 @COIN_HAS_WSMP_TRUE@am__append_5 = ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp
     93@COIN_HAS_AMD_TRUE@am__append_2 = ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
     94@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@am__append_3 = ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
     95@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__append_4 = ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
     96@COIN_HAS_MUMPS_TRUE@am__append_5 = ClpCholeskyMumps.cpp ClpCholeskyMumps.hpp
     97@COIN_HAS_WSMP_TRUE@am__append_6 = ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp
    5498bin_PROGRAMS = clp$(EXEEXT)
    55 @COIN_HAS_CHOLMOD_TRUE@am__append_6 = -I`$(CYGPATH_W) $(CHOLMODINCDIR)`
    56 @COIN_HAS_AMD_TRUE@am__append_7 = -I`$(CYGPATH_W) $(AMDINCDIR)`
     99@COIN_HAS_CHOLMOD_TRUE@am__append_7 = -I`$(CYGPATH_W) $(CHOLMODINCDIR)`
     100@COIN_HAS_AMD_TRUE@am__append_8 = -I`$(CYGPATH_W) $(AMDINCDIR)`
     101@COIN_HAS_ABC_TRUE@am__append_9 = AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp
    57102
    58103# if AMD, CHOLMOD, or GLPK is available, then install ClpCholeskyUfl.hpp (for advanced users)
    59 @COIN_HAS_AMD_TRUE@am__append_8 = ClpCholeskyUfl.hpp
    60 @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@am__append_9 = ClpCholeskyUfl.hpp
    61 @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__append_10 = ClpCholeskyUfl.hpp
    62 @COIN_HAS_MUMPS_TRUE@am__append_11 = ClpCholeskyMumps.hpp
    63 @COIN_HAS_WSMP_TRUE@am__append_12 = ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.hpp
     104@COIN_HAS_AMD_TRUE@am__append_10 = ClpCholeskyUfl.hpp
     105@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@am__append_11 = ClpCholeskyUfl.hpp
     106@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__append_12 = ClpCholeskyUfl.hpp
     107@COIN_HAS_MUMPS_TRUE@am__append_13 = ClpCholeskyMumps.hpp
     108@COIN_HAS_WSMP_TRUE@am__append_14 = ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.hpp
    64109subdir = src
    65110DIST_COMMON = $(am__includecoin_HEADERS_DIST) $(srcdir)/Makefile.am \
     
    118163        ClpSimplexNonlinear.hpp ClpSimplexOther.cpp \
    119164        ClpSimplexOther.hpp ClpSimplexPrimal.cpp ClpSimplexPrimal.hpp \
    120         ClpSolve.cpp ClpSolve.hpp AbcWarmStart.cpp AbcWarmStart.hpp \
    121         CoinAbcBaseFactorization.hpp CoinAbcCommonFactorization.hpp \
    122         CoinAbcCommon.hpp AbcDualRowDantzig.hpp AbcDualRowPivot.hpp \
    123         AbcDualRowSteepest.hpp CoinAbcFactorization.hpp \
    124         CoinAbcHelperFunctions.hpp AbcMatrix.hpp AbcCommon.hpp \
    125         AbcSimplexDual.hpp AbcSimplexPrimal.hpp AbcSimplex.hpp \
    126         CoinAbcBaseFactorization1.cpp CoinAbcBaseFactorization2.cpp \
    127         CoinAbcBaseFactorization3.cpp CoinAbcBaseFactorization4.cpp \
    128         CoinAbcBaseFactorization5.cpp CoinAbcDenseFactorization.cpp \
    129         CoinAbcDenseFactorization.hpp AbcDualRowDantzig.cpp \
    130         AbcDualRowPivot.cpp AbcDualRowSteepest.cpp \
    131         CoinAbcFactorization1.cpp CoinAbcFactorization2.cpp \
    132         CoinAbcFactorization3.cpp CoinAbcFactorization4.cpp \
    133         CoinAbcFactorization5.cpp CoinAbcHelperFunctions.cpp \
    134         AbcMatrix.cpp AbcSimplex.cpp AbcSimplexDual.cpp \
    135         AbcSimplexPrimal.cpp AbcSimplexParallel.cpp \
     165        ClpSolve.cpp ClpSolve.hpp Idiot.cpp Idiot.hpp IdiSolve.cpp \
     166        AbcCommon.hpp AbcDualRowDantzig.cpp AbcDualRowDantzig.hpp \
     167        AbcDualRowPivot.cpp AbcDualRowPivot.hpp AbcDualRowSteepest.cpp \
     168        AbcDualRowSteepest.hpp AbcMatrix.cpp AbcMatrix.hpp \
     169        AbcNonLinearCost.cpp AbcNonLinearCost.hpp \
    136170        AbcPrimalColumnDantzig.cpp AbcPrimalColumnDantzig.hpp \
    137171        AbcPrimalColumnPivot.cpp AbcPrimalColumnPivot.hpp \
    138172        AbcPrimalColumnSteepest.cpp AbcPrimalColumnSteepest.hpp \
    139         CoinAbcSmallFactorization1.cpp CoinAbcSmallFactorization2.cpp \
    140         CoinAbcSmallFactorization3.cpp CoinAbcSmallFactorization4.cpp \
    141         CoinAbcSmallFactorization5.cpp \
     173        AbcSimplex.cpp AbcSimplex.hpp AbcSimplexDual.cpp \
     174        AbcSimplexDual.hpp AbcSimplexPrimal.cpp AbcSimplexPrimal.hpp \
     175        AbcSimplexParallel.cpp AbcSimplexFactorization.cpp \
     176        AbcSimplexFactorization.hpp AbcWarmStart.cpp AbcWarmStart.hpp \
     177        CoinAbcBaseFactorization.hpp CoinAbcBaseFactorization1.cpp \
     178        CoinAbcBaseFactorization2.cpp CoinAbcBaseFactorization3.cpp \
     179        CoinAbcBaseFactorization4.cpp CoinAbcBaseFactorization5.cpp \
     180        CoinAbcCommonFactorization.hpp CoinAbcCommon.hpp \
     181        CoinAbcDenseFactorization.cpp CoinAbcDenseFactorization.hpp \
     182        CoinAbcFactorization.hpp CoinAbcFactorization1.cpp \
     183        CoinAbcFactorization2.cpp CoinAbcFactorization3.cpp \
     184        CoinAbcFactorization4.cpp CoinAbcFactorization5.cpp \
     185        CoinAbcHelperFunctions.cpp CoinAbcHelperFunctions.hpp \
    142186        CoinAbcOrderedFactorization1.cpp \
    143187        CoinAbcOrderedFactorization2.cpp \
    144188        CoinAbcOrderedFactorization3.cpp \
    145189        CoinAbcOrderedFactorization4.cpp \
    146         CoinAbcOrderedFactorization5.cpp AbcSimplexFactorization.cpp \
    147         AbcSimplexFactorization.hpp AbcNonLinearCost.cpp \
    148         AbcNonLinearCost.hpp Idiot.cpp Idiot.hpp IdiSolve.cpp \
    149         ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp ClpCholeskyMumps.cpp \
    150         ClpCholeskyMumps.hpp ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp \
     190        CoinAbcOrderedFactorization5.cpp \
     191        CoinAbcSmallFactorization1.cpp CoinAbcSmallFactorization2.cpp \
     192        CoinAbcSmallFactorization3.cpp CoinAbcSmallFactorization4.cpp \
     193        CoinAbcSmallFactorization5.cpp ClpCholeskyUfl.cpp \
     194        ClpCholeskyUfl.hpp ClpCholeskyMumps.cpp ClpCholeskyMumps.hpp \
     195        ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp \
    151196        ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp
    152 @COIN_HAS_AMD_TRUE@am__objects_1 = ClpCholeskyUfl.lo
    153 @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@am__objects_2 =  \
     197@COIN_HAS_ABC_TRUE@am__objects_1 = AbcDualRowDantzig.lo \
     198@COIN_HAS_ABC_TRUE@     AbcDualRowPivot.lo AbcDualRowSteepest.lo \
     199@COIN_HAS_ABC_TRUE@     AbcMatrix.lo AbcNonLinearCost.lo \
     200@COIN_HAS_ABC_TRUE@     AbcPrimalColumnDantzig.lo \
     201@COIN_HAS_ABC_TRUE@     AbcPrimalColumnPivot.lo \
     202@COIN_HAS_ABC_TRUE@     AbcPrimalColumnSteepest.lo AbcSimplex.lo \
     203@COIN_HAS_ABC_TRUE@     AbcSimplexDual.lo AbcSimplexPrimal.lo \
     204@COIN_HAS_ABC_TRUE@     AbcSimplexParallel.lo \
     205@COIN_HAS_ABC_TRUE@     AbcSimplexFactorization.lo AbcWarmStart.lo \
     206@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization1.lo \
     207@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization2.lo \
     208@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization3.lo \
     209@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization4.lo \
     210@COIN_HAS_ABC_TRUE@     CoinAbcBaseFactorization5.lo \
     211@COIN_HAS_ABC_TRUE@     CoinAbcDenseFactorization.lo \
     212@COIN_HAS_ABC_TRUE@     CoinAbcFactorization1.lo \
     213@COIN_HAS_ABC_TRUE@     CoinAbcFactorization2.lo \
     214@COIN_HAS_ABC_TRUE@     CoinAbcFactorization3.lo \
     215@COIN_HAS_ABC_TRUE@     CoinAbcFactorization4.lo \
     216@COIN_HAS_ABC_TRUE@     CoinAbcFactorization5.lo \
     217@COIN_HAS_ABC_TRUE@     CoinAbcHelperFunctions.lo \
     218@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization1.lo \
     219@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization2.lo \
     220@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization3.lo \
     221@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization4.lo \
     222@COIN_HAS_ABC_TRUE@     CoinAbcOrderedFactorization5.lo \
     223@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization1.lo \
     224@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization2.lo \
     225@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization3.lo \
     226@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization4.lo \
     227@COIN_HAS_ABC_TRUE@     CoinAbcSmallFactorization5.lo
     228@COIN_HAS_AMD_TRUE@am__objects_2 = ClpCholeskyUfl.lo
     229@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@am__objects_3 =  \
    154230@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@     ClpCholeskyUfl.lo
    155 @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__objects_3 = ClpCholeskyUfl.lo
    156 @COIN_HAS_MUMPS_TRUE@am__objects_4 = ClpCholeskyMumps.lo
    157 @COIN_HAS_WSMP_TRUE@am__objects_5 = ClpCholeskyWssmp.lo \
     231@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__objects_4 = ClpCholeskyUfl.lo
     232@COIN_HAS_MUMPS_TRUE@am__objects_5 = ClpCholeskyMumps.lo
     233@COIN_HAS_WSMP_TRUE@am__objects_6 = ClpCholeskyWssmp.lo \
    158234@COIN_HAS_WSMP_TRUE@    ClpCholeskyWssmpKKT.lo
    159235am_libClp_la_OBJECTS = ClpCholeskyBase.lo ClpCholeskyDense.lo \
     
    173249        ClpQuadraticObjective.lo ClpSimplex.lo ClpSimplexDual.lo \
    174250        ClpSimplexNonlinear.lo ClpSimplexOther.lo ClpSimplexPrimal.lo \
    175         ClpSolve.lo AbcWarmStart.lo CoinAbcBaseFactorization1.lo \
    176         CoinAbcBaseFactorization2.lo CoinAbcBaseFactorization3.lo \
    177         CoinAbcBaseFactorization4.lo CoinAbcBaseFactorization5.lo \
    178         CoinAbcDenseFactorization.lo AbcDualRowDantzig.lo \
    179         AbcDualRowPivot.lo AbcDualRowSteepest.lo \
    180         CoinAbcFactorization1.lo CoinAbcFactorization2.lo \
    181         CoinAbcFactorization3.lo CoinAbcFactorization4.lo \
    182         CoinAbcFactorization5.lo CoinAbcHelperFunctions.lo \
    183         AbcMatrix.lo AbcSimplex.lo AbcSimplexDual.lo \
    184         AbcSimplexPrimal.lo AbcSimplexParallel.lo \
    185         AbcPrimalColumnDantzig.lo AbcPrimalColumnPivot.lo \
    186         AbcPrimalColumnSteepest.lo CoinAbcSmallFactorization1.lo \
    187         CoinAbcSmallFactorization2.lo CoinAbcSmallFactorization3.lo \
    188         CoinAbcSmallFactorization4.lo CoinAbcSmallFactorization5.lo \
    189         CoinAbcOrderedFactorization1.lo \
    190         CoinAbcOrderedFactorization2.lo \
    191         CoinAbcOrderedFactorization3.lo \
    192         CoinAbcOrderedFactorization4.lo \
    193         CoinAbcOrderedFactorization5.lo AbcSimplexFactorization.lo \
    194         AbcNonLinearCost.lo Idiot.lo IdiSolve.lo $(am__objects_1) \
     251        ClpSolve.lo Idiot.lo IdiSolve.lo $(am__objects_1) \
    195252        $(am__objects_2) $(am__objects_3) $(am__objects_4) \
    196         $(am__objects_5)
     253        $(am__objects_5) $(am__objects_6)
    197254libClp_la_OBJECTS = $(am_libClp_la_OBJECTS)
    198255binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     
    244301        ClpQuadraticObjective.hpp ClpSimplex.hpp \
    245302        ClpSimplexNonlinear.hpp ClpSimplexOther.hpp ClpSimplexDual.hpp \
    246         ClpSimplexPrimal.hpp ClpSolve.hpp CbcOrClpParam.hpp \
    247         AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp Idiot.hpp \
     303        ClpSimplexPrimal.hpp ClpSolve.hpp CbcOrClpParam.hpp Idiot.hpp \
     304        AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp \
    248305        ClpCholeskyUfl.hpp ClpCholeskyMumps.hpp ClpCholeskyWssmp.hpp \
    249306        ClpCholeskyWssmpKKT.hpp CbcOrClpParam.cpp
     
    305362COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
    306363COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
     364COIN_HAS_ABC_FALSE = @COIN_HAS_ABC_FALSE@
     365COIN_HAS_ABC_TRUE = @COIN_HAS_ABC_TRUE@
    307366COIN_HAS_AMD_FALSE = @COIN_HAS_AMD_FALSE@
    308367COIN_HAS_AMD_TRUE = @COIN_HAS_AMD_TRUE@
     
    549608        ClpSimplexNonlinear.hpp ClpSimplexOther.cpp \
    550609        ClpSimplexOther.hpp ClpSimplexPrimal.cpp ClpSimplexPrimal.hpp \
    551         ClpSolve.cpp ClpSolve.hpp AbcWarmStart.cpp AbcWarmStart.hpp \
    552         CoinAbcBaseFactorization.hpp CoinAbcCommonFactorization.hpp \
    553         CoinAbcCommon.hpp AbcDualRowDantzig.hpp AbcDualRowPivot.hpp \
    554         AbcDualRowSteepest.hpp CoinAbcFactorization.hpp \
    555         CoinAbcHelperFunctions.hpp AbcMatrix.hpp AbcCommon.hpp \
    556         AbcSimplexDual.hpp AbcSimplexPrimal.hpp AbcSimplex.hpp \
    557         CoinAbcBaseFactorization1.cpp CoinAbcBaseFactorization2.cpp \
    558         CoinAbcBaseFactorization3.cpp CoinAbcBaseFactorization4.cpp \
    559         CoinAbcBaseFactorization5.cpp CoinAbcDenseFactorization.cpp \
    560         CoinAbcDenseFactorization.hpp AbcDualRowDantzig.cpp \
    561         AbcDualRowPivot.cpp AbcDualRowSteepest.cpp \
    562         CoinAbcFactorization1.cpp CoinAbcFactorization2.cpp \
    563         CoinAbcFactorization3.cpp CoinAbcFactorization4.cpp \
    564         CoinAbcFactorization5.cpp CoinAbcHelperFunctions.cpp \
    565         AbcMatrix.cpp AbcSimplex.cpp AbcSimplexDual.cpp \
    566         AbcSimplexPrimal.cpp AbcSimplexParallel.cpp \
    567         AbcPrimalColumnDantzig.cpp AbcPrimalColumnDantzig.hpp \
    568         AbcPrimalColumnPivot.cpp AbcPrimalColumnPivot.hpp \
    569         AbcPrimalColumnSteepest.cpp AbcPrimalColumnSteepest.hpp \
    570         CoinAbcSmallFactorization1.cpp CoinAbcSmallFactorization2.cpp \
    571         CoinAbcSmallFactorization3.cpp CoinAbcSmallFactorization4.cpp \
    572         CoinAbcSmallFactorization5.cpp \
    573         CoinAbcOrderedFactorization1.cpp \
    574         CoinAbcOrderedFactorization2.cpp \
    575         CoinAbcOrderedFactorization3.cpp \
    576         CoinAbcOrderedFactorization4.cpp \
    577         CoinAbcOrderedFactorization5.cpp AbcSimplexFactorization.cpp \
    578         AbcSimplexFactorization.hpp AbcNonLinearCost.cpp \
    579         AbcNonLinearCost.hpp Idiot.cpp Idiot.hpp IdiSolve.cpp \
     610        ClpSolve.cpp ClpSolve.hpp Idiot.cpp Idiot.hpp IdiSolve.cpp \
    580611        $(am__append_1) $(am__append_2) $(am__append_3) \
    581         $(am__append_4) $(am__append_5)
     612        $(am__append_4) $(am__append_5) $(am__append_6)
    582613
    583614# This is for libtool
     
    604635
    605636# CbcOrClpParam seem to require COIN_HAS_CLP so that it knows that it is build within Clp
    606 AM_CPPFLAGS = $(CLPLIB_CFLAGS) -DCOIN_HAS_CLP $(am__append_6) \
    607         $(am__append_7)
     637AM_CPPFLAGS = $(CLPLIB_CFLAGS) -DCOIN_HAS_CLP $(am__append_7) \
     638        $(am__append_8)
    608639
    609640# This line is necessary to allow VPATH compilation
     
    634665        ClpQuadraticObjective.hpp ClpSimplex.hpp \
    635666        ClpSimplexNonlinear.hpp ClpSimplexOther.hpp ClpSimplexDual.hpp \
    636         ClpSimplexPrimal.hpp ClpSolve.hpp CbcOrClpParam.hpp \
    637         AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp Idiot.hpp \
    638         $(am__append_8) $(am__append_9) $(am__append_10) \
    639         $(am__append_11) $(am__append_12) CbcOrClpParam.cpp
     667        ClpSimplexPrimal.hpp ClpSolve.hpp CbcOrClpParam.hpp Idiot.hpp \
     668        $(am__append_9) $(am__append_10) $(am__append_11) \
     669        $(am__append_12) $(am__append_13) $(am__append_14) \
     670        CbcOrClpParam.cpp
    640671all: config.h config_clp.h
    641672        $(MAKE) $(AM_MAKEFLAGS) all-recursive
Note: See TracChangeset for help on using the changeset viewer.