Changeset 1501 for trunk/Cbc/src


Ignore:
Timestamp:
Sep 13, 2010 3:41:21 AM (9 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
trunk/Cbc/src
Files:
3 edited

Legend:

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

    r1466 r1501  
    112112
    113113# Some common setup for cbc and cbc-generic.
     114#   ($(CPX_LIBS) should resolve in an empty string if there is no cplex)
    114115
    115116bin_PROGRAMS =
    116 AM_CPPFLAGS = $(COINDEPEND_CFLAGS)
     117AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_LIBS)
    117118
    118119########################################################################
     
    130131
    131132# Additional COIN libraries
    132 cbc_LDADD = libCbcSolver.la libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
     133cbc_LDADD = libCbcSolver.la libCbc.la $(CBCLIB_LIBS)
    133134
    134135# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    138139
    139140# Add locations of include files.
    140 
    141 if COIN_HAS_CLP
    142   AM_CPPFLAGS += $(CLP_CFLAGS)
    143   cbc_LDADD += $(CLP_LIBS)
    144 endif
    145 
    146 if COIN_HAS_CPX
    147   AM_CPPFLAGS += $(CPX_CFLAGS)
    148   cbc_LDADD += $(CPX_LIBS)
    149 endif
    150141
    151142if COIN_HAS_ASL
     
    181172        CbcGenSolvers.cpp
    182173
    183 cbc_generic_LDADD = libCbcSolver.la libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
     174cbc_generic_LDADD = libCbcSolver.la libCbc.la $(CBCGENERIC_LIBS)
    184175
    185176# List all additionally required solver and Osi libraries
    186 
    187 if COIN_HAS_CLP
    188   AM_CPPFLAGS += $(CLP_CFLAGS)
    189   cbc_generic_LDADD += $(CLP_LIBS)
    190 endif
    191 
    192 if COIN_HAS_CPX
    193   AM_CPPFLAGS += $(CPX_CFLAGS)
    194   cbc_generic_LDADD += $(CPX_LIBS)
    195 endif
    196 
    197 if COIN_HAS_DYLP
    198   AM_CPPFLAGS += $(DYLP_CFLAGS)
    199   cbc_generic_LDADD += $(DYLP_LIBS)
    200 endif
    201 
    202 if COIN_HAS_GLPK
    203   AM_CPPFLAGS += $(GLPK_CFLAGS)
    204   cbc_generic_LDADD += $(GLPK_LIBS)
    205 endif
    206 
    207 if COIN_HAS_MSK
    208   AM_CPPFLAGS += $(MSK_CFLAGS)
    209   cbc_generic_LDADD += $(MSK_LIBS)
    210 endif
    211 
    212 if COIN_HAS_SPX
    213   AM_CPPFLAGS += $(SPX_CFLAGS)
    214   cbc_generic_LDADD += $(SPX_LIBS)
    215 endif
    216 
    217 if COIN_HAS_VOL
    218   AM_CPPFLAGS += $(VOL_CFLAGS)
    219   cbc_generic_LDADD += $(VOL_LIBS)
    220 endif
    221 
    222 if COIN_HAS_XPR
    223   AM_CPPFLAGS += $(XPR_CFLAGS)
    224   cbc_generic_LDADD += $(XPR_LIBS)
    225 endif
     177# the linker flags for all available LP solvers should already be included in $CBCGENERIC_LIBS,
     178# so just add compiler flags here (all we can think of)
     179
     180AM_CPPFLAGS += $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    226181
    227182if COIN_HAS_ASL
  • trunk/Cbc/src/Makefile.in

    r1490 r1501  
    5656
    5757# Add locations of include files.
    58 @COIN_HAS_CLP_TRUE@am__append_2 = $(CLP_CFLAGS)
    59 @COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__append_3 = $(CPX_CFLAGS)
    60 @COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__append_4 = $(CPX_LIBS)
    61 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_5 = $(ASL_CFLAGS)
    62 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_6 = $(ASL_LIBS)
     58@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_2 = $(ASL_CFLAGS)
     59@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_3 = $(ASL_LIBS)
    6360
    6461########################################################################
     
    6865# Name of the executable compiled in this directory.  We want it to be
    6966# installed in the 'bin' directory
    70 @CBC_BUILD_CBC_GENERIC_TRUE@am__append_7 = cbc-generic
     67@CBC_BUILD_CBC_GENERIC_TRUE@am__append_4 = cbc-generic
    7168
    7269# List all additionally required solver and Osi libraries
    73 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_8 = $(CLP_CFLAGS)
    74 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__append_9 = $(CLP_LIBS)
    75 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__append_10 = $(CPX_CFLAGS)
    76 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__append_11 = $(CPX_LIBS)
    77 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_12 = $(DYLP_CFLAGS)
    78 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__append_13 = $(DYLP_LIBS)
    79 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__append_14 = $(GLPK_CFLAGS)
    80 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__append_15 = $(GLPK_LIBS)
    81 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_16 = $(MSK_CFLAGS)
    82 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__append_17 = $(MSK_LIBS)
    83 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__append_18 = $(SPX_CFLAGS)
    84 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__append_19 = $(SPX_LIBS)
    85 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_20 = $(VOL_CFLAGS)
    86 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__append_21 = $(VOL_LIBS)
    87 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_22 = $(XPR_CFLAGS)
    88 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_23 = $(XPR_LIBS)
    89 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_24 = $(ASL_CFLAGS)
    90 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_25 = $(ASL_LIBS)
     70# the linker flags for all available LP solvers should already be included in $CBCGENERIC_LIBS,
     71# so just add compiler flags here (all we can think of)
     72@CBC_BUILD_CBC_GENERIC_TRUE@am__append_5 = $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
     73@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_6 = $(ASL_CFLAGS)
     74@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__append_7 = $(ASL_LIBS)
    9175subdir = src
    9276DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
     
    151135cbc_OBJECTS = $(am_cbc_OBJECTS)
    152136am__DEPENDENCIES_1 =
    153 @COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_2 =  \
    154 @COIN_HAS_CLP_TRUE@@COIN_HAS_CPX_TRUE@  $(am__DEPENDENCIES_1)
    155 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_3 =  \
     137@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_2 =  \
    156138@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@  $(am__DEPENDENCIES_1)
    157139@COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbcSolver.la libCbc.la \
    158 @COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    159 @COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
    160 @COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_3)
     140@COIN_HAS_CLP_TRUE@     $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
    161141am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \
    162142        CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \
     
    179159@CBC_BUILD_CBC_GENERIC_TRUE@    CbcGenSolvers.$(OBJEXT)
    180160cbc_generic_OBJECTS = $(am_cbc_generic_OBJECTS)
    181 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
    182 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
    183 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
    184 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
    185 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
    186 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SPX_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
    187 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
    188 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
    189 @CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
     161@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
    190162@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES =  \
    191163@CBC_BUILD_CBC_GENERIC_TRUE@    libCbcSolver.la libCbc.la \
    192164@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_1) \
    193 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_1) \
    194 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_4) \
    195 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_5) \
    196 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_6) \
    197 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_7) \
    198 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_8) \
    199 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_9) \
    200 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_10) \
    201 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_11) \
    202 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_12)
     165@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_3)
    203166depcomp = $(SHELL) $(top_srcdir)/depcomp
    204167am__depfiles_maybe = depfiles
     
    255218AWK = @AWK@
    256219BUILDTOOLSDIR = @BUILDTOOLSDIR@
     220CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
     221CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
     222CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
     223CBCLIB_LIBS = @CBCLIB_LIBS@
     224CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
     225CBCLIB_PCREQUIRES = @CBCLIB_PCREQUIRES@
    257226CBC_BUILD_CBC_GENERIC_FALSE = @CBC_BUILD_CBC_GENERIC_FALSE@
    258227CBC_BUILD_CBC_GENERIC_TRUE = @CBC_BUILD_CBC_GENERIC_TRUE@
     
    401370PKG_CONFIG = @PKG_CONFIG@
    402371RANLIB = @RANLIB@
    403 REQUIREDPACKAGES = @REQUIREDPACKAGES@
    404372RPATH_FLAGS = @RPATH_FLAGS@
    405373SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     
    588556
    589557# List additional defines
    590 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(am__append_2) $(am__append_3) \
    591         $(am__append_5) $(am__append_8) $(am__append_10) \
    592         $(am__append_12) $(am__append_14) $(am__append_16) \
    593         $(am__append_18) $(am__append_20) $(am__append_22) \
    594         $(am__append_24) -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
     558AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_LIBS) \
     559        $(am__append_2) $(am__append_5) $(am__append_6) \
     560        -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
    595561
    596562# List all source files for this executable, including headers
     
    599565# Additional COIN libraries
    600566@COIN_HAS_CLP_TRUE@cbc_LDADD = libCbcSolver.la libCbc.la \
    601 @COIN_HAS_CLP_TRUE@     $(COINDEPEND_LIBS) $(ADDLIBS) $(CLP_LIBS) \
    602 @COIN_HAS_CLP_TRUE@     $(am__append_4) $(am__append_6)
     567@COIN_HAS_CLP_TRUE@     $(CBCLIB_LIBS) $(am__append_3)
    603568
    604569# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    620585
    621586@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDADD = libCbcSolver.la \
    622 @CBC_BUILD_CBC_GENERIC_TRUE@    libCbc.la $(COINDEPEND_LIBS) \
    623 @CBC_BUILD_CBC_GENERIC_TRUE@    $(ADDLIBS) $(am__append_9) \
    624 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_11) $(am__append_13) \
    625 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_15) $(am__append_17) \
    626 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_19) $(am__append_21) \
    627 @CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_23) $(am__append_25)
     587@CBC_BUILD_CBC_GENERIC_TRUE@    libCbc.la $(CBCGENERIC_LIBS) \
     588@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__append_7)
    628589
    629590# Finally, the -rpath flag is used by libtool to make sure that the shared
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1490 r1501  
    123123AWK = @AWK@
    124124BUILDTOOLSDIR = @BUILDTOOLSDIR@
     125CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
     126CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
     127CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
     128CBCLIB_LIBS = @CBCLIB_LIBS@
     129CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
     130CBCLIB_PCREQUIRES = @CBCLIB_PCREQUIRES@
    125131CBC_BUILD_CBC_GENERIC_FALSE = @CBC_BUILD_CBC_GENERIC_FALSE@
    126132CBC_BUILD_CBC_GENERIC_TRUE = @CBC_BUILD_CBC_GENERIC_TRUE@
     
    269275PKG_CONFIG = @PKG_CONFIG@
    270276RANLIB = @RANLIB@
    271 REQUIREDPACKAGES = @REQUIREDPACKAGES@
    272277RPATH_FLAGS = @RPATH_FLAGS@
    273278SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
Note: See TracChangeset for help on using the changeset viewer.