Changeset 1541 for trunk/Cbc/src


Ignore:
Timestamp:
Nov 28, 2010 3:40:15 PM (9 years ago)
Author:
stefan
Message:

use new fallback variables to setup addlibs file in fallback mode; use pkg-config or these variables for examples Makefile

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r1531 r1541  
    211211ASL_CFLAGS = @ASL_CFLAGS@
    212212ASL_DATA = @ASL_DATA@
     213ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
    213214ASL_LIBS = @ASL_LIBS@
    214215AUTOCONF = @AUTOCONF@
     
    219220BUILDTOOLSDIR = @BUILDTOOLSDIR@
    220221CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
     222CBCGENERIC_CFLAGS_INSTALLED = @CBCGENERIC_CFLAGS_INSTALLED@
    221223CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
     224CBCGENERIC_LIBS_INSTALLED = @CBCGENERIC_LIBS_INSTALLED@
    222225CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
    223226CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
    224227CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
     228CBCLIB_CFLAGS_INSTALLED = @CBCLIB_CFLAGS_INSTALLED@
    225229CBCLIB_LIBS = @CBCLIB_LIBS@
     230CBCLIB_LIBS_INSTALLED = @CBCLIB_LIBS_INSTALLED@
    226231CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
    227232CBCLIB_PCREQUIRES = @CBCLIB_PCREQUIRES@
     
    235240CLP_CFLAGS = @CLP_CFLAGS@
    236241CLP_DATA = @CLP_DATA@
     242CLP_DATA_INSTALLED = @CLP_DATA_INSTALLED@
    237243CLP_LIBS = @CLP_LIBS@
    238244COINDEPEND_CFLAGS = @COINDEPEND_CFLAGS@
    239245COINDEPEND_DATA = @COINDEPEND_DATA@
     246COINDEPEND_DATA_INSTALLED = @COINDEPEND_DATA_INSTALLED@
    240247COINDEPEND_LIBS = @COINDEPEND_LIBS@
     248COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
     249COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
     250COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
     251COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
    241252COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    242253COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
     
    277288CPX_CFLAGS = @CPX_CFLAGS@
    278289CPX_DATA = @CPX_DATA@
     290CPX_DATA_INSTALLED = @CPX_DATA_INSTALLED@
    279291CPX_LIBS = @CPX_LIBS@
    280292CXX = @CXX@
     
    290302DYLP_CFLAGS = @DYLP_CFLAGS@
    291303DYLP_DATA = @DYLP_DATA@
     304DYLP_DATA_INSTALLED = @DYLP_DATA_INSTALLED@
    292305DYLP_LIBS = @DYLP_LIBS@
    293306ECHO = @ECHO@
     
    302315GLPK_CFLAGS = @GLPK_CFLAGS@
    303316GLPK_DATA = @GLPK_DATA@
     317GLPK_DATA_INSTALLED = @GLPK_DATA_INSTALLED@
    304318GLPK_LIBS = @GLPK_LIBS@
    305319GRB_CFLAGS = @GRB_CFLAGS@
    306320GRB_DATA = @GRB_DATA@
     321GRB_DATA_INSTALLED = @GRB_DATA_INSTALLED@
    307322GRB_LIBS = @GRB_LIBS@
    308323HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    327342MIPLIB3_CFLAGS = @MIPLIB3_CFLAGS@
    328343MIPLIB3_DATA = @MIPLIB3_DATA@
     344MIPLIB3_DATA_INSTALLED = @MIPLIB3_DATA_INSTALLED@
    329345MIPLIB3_LIBS = @MIPLIB3_LIBS@
    330346MPICC = @MPICC@
     
    332348MSK_CFLAGS = @MSK_CFLAGS@
    333349MSK_DATA = @MSK_DATA@
     350MSK_DATA_INSTALLED = @MSK_DATA_INSTALLED@
    334351MSK_LIBS = @MSK_LIBS@
    335352NETLIB_CFLAGS = @NETLIB_CFLAGS@
    336353NETLIB_DATA = @NETLIB_DATA@
     354NETLIB_DATA_INSTALLED = @NETLIB_DATA_INSTALLED@
    337355NETLIB_LIBS = @NETLIB_LIBS@
    338356OBJEXT = @OBJEXT@
     
    361379OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    362380OSITESTS_DATA = @OSITESTS_DATA@
     381OSITESTS_DATA_INSTALLED = @OSITESTS_DATA_INSTALLED@
    363382OSITESTS_LIBS = @OSITESTS_LIBS@
    364383PACKAGE = @PACKAGE@
     
    375394SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
    376395SAMPLE_DATA = @SAMPLE_DATA@
     396SAMPLE_DATA_INSTALLED = @SAMPLE_DATA_INSTALLED@
    377397SAMPLE_LIBS = @SAMPLE_LIBS@
    378398SET_MAKE = @SET_MAKE@
     
    380400SPX_CFLAGS = @SPX_CFLAGS@
    381401SPX_DATA = @SPX_DATA@
     402SPX_DATA_INSTALLED = @SPX_DATA_INSTALLED@
    382403SPX_LIBS = @SPX_LIBS@
    383404STRIP = @STRIP@
     
    385406VOL_CFLAGS = @VOL_CFLAGS@
    386407VOL_DATA = @VOL_DATA@
     408VOL_DATA_INSTALLED = @VOL_DATA_INSTALLED@
    387409VOL_LIBS = @VOL_LIBS@
    388410VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    389411XPR_CFLAGS = @XPR_CFLAGS@
    390412XPR_DATA = @XPR_DATA@
     413XPR_DATA_INSTALLED = @XPR_DATA_INSTALLED@
    391414XPR_LIBS = @XPR_LIBS@
    392415abs_bin_dir = @abs_bin_dir@
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1516 r1541  
    116116ASL_CFLAGS = @ASL_CFLAGS@
    117117ASL_DATA = @ASL_DATA@
     118ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
    118119ASL_LIBS = @ASL_LIBS@
    119120AUTOCONF = @AUTOCONF@
     
    124125BUILDTOOLSDIR = @BUILDTOOLSDIR@
    125126CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
     127CBCGENERIC_CFLAGS_INSTALLED = @CBCGENERIC_CFLAGS_INSTALLED@
    126128CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
     129CBCGENERIC_LIBS_INSTALLED = @CBCGENERIC_LIBS_INSTALLED@
    127130CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
    128131CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
    129132CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
     133CBCLIB_CFLAGS_INSTALLED = @CBCLIB_CFLAGS_INSTALLED@
    130134CBCLIB_LIBS = @CBCLIB_LIBS@
     135CBCLIB_LIBS_INSTALLED = @CBCLIB_LIBS_INSTALLED@
    131136CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
    132137CBCLIB_PCREQUIRES = @CBCLIB_PCREQUIRES@
     
    140145CLP_CFLAGS = @CLP_CFLAGS@
    141146CLP_DATA = @CLP_DATA@
     147CLP_DATA_INSTALLED = @CLP_DATA_INSTALLED@
    142148CLP_LIBS = @CLP_LIBS@
    143149COINDEPEND_CFLAGS = @COINDEPEND_CFLAGS@
    144150COINDEPEND_DATA = @COINDEPEND_DATA@
     151COINDEPEND_DATA_INSTALLED = @COINDEPEND_DATA_INSTALLED@
    145152COINDEPEND_LIBS = @COINDEPEND_LIBS@
     153COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
     154COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
     155COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
     156COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
    146157COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    147158COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
     
    182193CPX_CFLAGS = @CPX_CFLAGS@
    183194CPX_DATA = @CPX_DATA@
     195CPX_DATA_INSTALLED = @CPX_DATA_INSTALLED@
    184196CPX_LIBS = @CPX_LIBS@
    185197CXX = @CXX@
     
    195207DYLP_CFLAGS = @DYLP_CFLAGS@
    196208DYLP_DATA = @DYLP_DATA@
     209DYLP_DATA_INSTALLED = @DYLP_DATA_INSTALLED@
    197210DYLP_LIBS = @DYLP_LIBS@
    198211ECHO = @ECHO@
     
    207220GLPK_CFLAGS = @GLPK_CFLAGS@
    208221GLPK_DATA = @GLPK_DATA@
     222GLPK_DATA_INSTALLED = @GLPK_DATA_INSTALLED@
    209223GLPK_LIBS = @GLPK_LIBS@
    210224GRB_CFLAGS = @GRB_CFLAGS@
    211225GRB_DATA = @GRB_DATA@
     226GRB_DATA_INSTALLED = @GRB_DATA_INSTALLED@
    212227GRB_LIBS = @GRB_LIBS@
    213228HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    232247MIPLIB3_CFLAGS = @MIPLIB3_CFLAGS@
    233248MIPLIB3_DATA = @MIPLIB3_DATA@
     249MIPLIB3_DATA_INSTALLED = @MIPLIB3_DATA_INSTALLED@
    234250MIPLIB3_LIBS = @MIPLIB3_LIBS@
    235251MPICC = @MPICC@
     
    237253MSK_CFLAGS = @MSK_CFLAGS@
    238254MSK_DATA = @MSK_DATA@
     255MSK_DATA_INSTALLED = @MSK_DATA_INSTALLED@
    239256MSK_LIBS = @MSK_LIBS@
    240257NETLIB_CFLAGS = @NETLIB_CFLAGS@
    241258NETLIB_DATA = @NETLIB_DATA@
     259NETLIB_DATA_INSTALLED = @NETLIB_DATA_INSTALLED@
    242260NETLIB_LIBS = @NETLIB_LIBS@
    243261OBJEXT = @OBJEXT@
     
    266284OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    267285OSITESTS_DATA = @OSITESTS_DATA@
     286OSITESTS_DATA_INSTALLED = @OSITESTS_DATA_INSTALLED@
    268287OSITESTS_LIBS = @OSITESTS_LIBS@
    269288PACKAGE = @PACKAGE@
     
    280299SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
    281300SAMPLE_DATA = @SAMPLE_DATA@
     301SAMPLE_DATA_INSTALLED = @SAMPLE_DATA_INSTALLED@
    282302SAMPLE_LIBS = @SAMPLE_LIBS@
    283303SET_MAKE = @SET_MAKE@
     
    285305SPX_CFLAGS = @SPX_CFLAGS@
    286306SPX_DATA = @SPX_DATA@
     307SPX_DATA_INSTALLED = @SPX_DATA_INSTALLED@
    287308SPX_LIBS = @SPX_LIBS@
    288309STRIP = @STRIP@
     
    290311VOL_CFLAGS = @VOL_CFLAGS@
    291312VOL_DATA = @VOL_DATA@
     313VOL_DATA_INSTALLED = @VOL_DATA_INSTALLED@
    292314VOL_LIBS = @VOL_LIBS@
    293315VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    294316XPR_CFLAGS = @XPR_CFLAGS@
    295317XPR_DATA = @XPR_DATA@
     318XPR_DATA_INSTALLED = @XPR_DATA_INSTALLED@
    296319XPR_LIBS = @XPR_LIBS@
    297320abs_bin_dir = @abs_bin_dir@
Note: See TracChangeset for help on using the changeset viewer.