Ignore:
Timestamp:
Apr 15, 2014 11:54:11 AM (5 years ago)
Author:
forrest
Message:

fix some ampl stuff, add ClpSolver? and a few fixes

File:
1 edited

Legend:

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

    r2024 r2030  
    1515# Name of the library compiled in this directory.  We want it to be installed
    1616# in the 'lib' directory
    17 lib_LTLIBRARIES = libClp.la
     17lib_LTLIBRARIES = libClp.la libClpSolver.la
    1818
    1919# List all source files for this library, including headers
     
    114114endif
    115115
    116 # if AMD, CHOLMOD, or GLPK is available, then compile ClpCholeskyUfl.cpp
    117 if COIN_HAS_AMD
    118 libClp_la_SOURCES += ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
    119 else
    120 if COIN_HAS_CHOLMOD
    121 libClp_la_SOURCES += ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
    122 else
    123 if COIN_HAS_GLPK
    124 libClp_la_SOURCES += ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
    125 endif
    126 endif
    127 endif
    128 
    129 if COIN_HAS_MUMPS
    130 libClp_la_SOURCES += ClpCholeskyMumps.cpp ClpCholeskyMumps.hpp
    131 endif
    132 
    133 if COIN_HAS_WSMP
    134 libClp_la_SOURCES += ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp
    135 endif
    136 
    137 # List all additionally required libraries
    138 if DEPENDENCY_LINKING
    139 libClp_la_LIBADD = $(CLPLIB_LIBS)
    140 endif
    141 
    142 # This is for libtool
    143 libClp_la_LDFLAGS = $(LT_LDFLAGS)
    144 
    145 ########################################################################
    146 #                            clp program                               #
    147 ########################################################################
    148 
    149 # Name of the executable compiled in this directory.  We want it to be
    150 # installed in the 'bin' directory
    151 bin_PROGRAMS = clp
    152 
    153 # List all source files for this executable, including headers
    154 clp_SOURCES = \
    155         ClpMain.cpp \
     116libClpSolver_la_SOURCES = \
     117        ClpSolver.cpp \
    156118        CbcOrClpParam.cpp CbcOrClpParam.hpp \
    157119        Clp_ampl.cpp Clp_ampl.h \
     
    160122        unitTest.cpp
    161123
     124# if AMD, CHOLMOD, or GLPK is available, then compile ClpCholeskyUfl.cpp
     125if COIN_HAS_AMD
     126libClp_la_SOURCES += ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
     127else
     128if COIN_HAS_CHOLMOD
     129libClp_la_SOURCES += ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
     130else
     131if COIN_HAS_GLPK
     132libClp_la_SOURCES += ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
     133endif
     134endif
     135endif
     136
     137if COIN_HAS_MUMPS
     138libClp_la_SOURCES += ClpCholeskyMumps.cpp ClpCholeskyMumps.hpp
     139endif
     140
     141if COIN_HAS_WSMP
     142libClp_la_SOURCES += ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp
     143endif
     144
    162145# List all additionally required libraries
    163 clp_LDADD = libClp.la $(CLPLIB_LIBS) $(ASL_LIBS)
     146if DEPENDENCY_LINKING
     147libClp_la_LIBADD = $(CLPLIB_LIBS)
     148libClpSolver_la_LIBADD = $(CLPLIB_LIBS) libClp.la
     149endif
     150
     151# This is for libtool
     152libClp_la_LDFLAGS = $(LT_LDFLAGS)
     153libClpSolver_la_LDFLAGS = $(LT_LDFLAGS)
     154
     155########################################################################
     156#                            clp program                               #
     157########################################################################
     158
     159# Name of the executable compiled in this directory.  We want it to be
     160# installed in the 'bin' directory
     161bin_PROGRAMS = clp
     162
     163# List all source files for this executable, including headers
     164clp_SOURCES = ClpMain.cpp
     165
     166# List all additionally required libraries
     167clp_LDADD = libClpSolver.la libClp.la $(CLPLIB_LIBS) $(ASL_LIBS)
    164168
    165169# List all dependency libraries (similar to LDADD, but without -l, -L flags)
    166 clp_DEPENDENCIES = libClp.la $(CLPLIB_DEPENDENCIES)
     170clp_DEPENDENCIES = libClpSolver.la libClp.la $(CLPLIB_DEPENDENCIES)
    167171
    168172########################################################################
     
    261265endif
    262266
    263 # needed by Cbc
     267# needed by Clp
    264268includecoin_HEADERS += CbcOrClpParam.cpp
    265269
Note: See TracChangeset for help on using the changeset viewer.