Ignore:
Timestamp:
Dec 19, 2010 1:42:04 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev1551, except for chgsets 1539,1540

Location:
stable/2.6/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.6/Cbc

  • stable/2.6/Cbc/Makefile.in

    r1516 r1553  
    124124AR = @AR@
    125125ASL_CFLAGS = @ASL_CFLAGS@
     126ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
    126127ASL_DATA = @ASL_DATA@
     128ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
     129ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
    127130ASL_LIBS = @ASL_LIBS@
     131ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
    128132AUTOCONF = @AUTOCONF@
    129133AUTOHEADER = @AUTOHEADER@
     
    133137BUILDTOOLSDIR = @BUILDTOOLSDIR@
    134138CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
     139CBCGENERIC_CFLAGS_INSTALLED = @CBCGENERIC_CFLAGS_INSTALLED@
     140CBCGENERIC_DEPENDENCIES = @CBCGENERIC_DEPENDENCIES@
    135141CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
     142CBCGENERIC_LIBS_INSTALLED = @CBCGENERIC_LIBS_INSTALLED@
    136143CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
    137144CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
    138145CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
     146CBCLIB_CFLAGS_INSTALLED = @CBCLIB_CFLAGS_INSTALLED@
     147CBCLIB_DEPENDENCIES = @CBCLIB_DEPENDENCIES@
    139148CBCLIB_LIBS = @CBCLIB_LIBS@
     149CBCLIB_LIBS_INSTALLED = @CBCLIB_LIBS_INSTALLED@
    140150CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
    141151CBCLIB_PCREQUIRES = @CBCLIB_PCREQUIRES@
     
    148158CFLAGS = @CFLAGS@
    149159CLP_CFLAGS = @CLP_CFLAGS@
     160CLP_CFLAGS_INSTALLED = @CLP_CFLAGS_INSTALLED@
    150161CLP_DATA = @CLP_DATA@
     162CLP_DATA_INSTALLED = @CLP_DATA_INSTALLED@
     163CLP_DEPENDENCIES = @CLP_DEPENDENCIES@
    151164CLP_LIBS = @CLP_LIBS@
     165CLP_LIBS_INSTALLED = @CLP_LIBS_INSTALLED@
    152166COINDEPEND_CFLAGS = @COINDEPEND_CFLAGS@
     167COINDEPEND_CFLAGS_INSTALLED = @COINDEPEND_CFLAGS_INSTALLED@
    153168COINDEPEND_DATA = @COINDEPEND_DATA@
     169COINDEPEND_DATA_INSTALLED = @COINDEPEND_DATA_INSTALLED@
     170COINDEPEND_DEPENDENCIES = @COINDEPEND_DEPENDENCIES@
    154171COINDEPEND_LIBS = @COINDEPEND_LIBS@
     172COINDEPEND_LIBS_INSTALLED = @COINDEPEND_LIBS_INSTALLED@
     173COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
     174COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
     175COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
     176COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
    155177COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    156178COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
     
    190212CPPFLAGS = @CPPFLAGS@
    191213CPX_CFLAGS = @CPX_CFLAGS@
     214CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
    192215CPX_DATA = @CPX_DATA@
     216CPX_DATA_INSTALLED = @CPX_DATA_INSTALLED@
     217CPX_DEPENDENCIES = @CPX_DEPENDENCIES@
    193218CPX_LIBS = @CPX_LIBS@
     219CPX_LIBS_INSTALLED = @CPX_LIBS_INSTALLED@
    194220CXX = @CXX@
    195221CXXCPP = @CXXCPP@
     
    203229DEPDIR = @DEPDIR@
    204230DYLP_CFLAGS = @DYLP_CFLAGS@
     231DYLP_CFLAGS_INSTALLED = @DYLP_CFLAGS_INSTALLED@
    205232DYLP_DATA = @DYLP_DATA@
     233DYLP_DATA_INSTALLED = @DYLP_DATA_INSTALLED@
     234DYLP_DEPENDENCIES = @DYLP_DEPENDENCIES@
    206235DYLP_LIBS = @DYLP_LIBS@
     236DYLP_LIBS_INSTALLED = @DYLP_LIBS_INSTALLED@
    207237ECHO = @ECHO@
    208238ECHO_C = @ECHO_C@
     
    215245FFLAGS = @FFLAGS@
    216246GLPK_CFLAGS = @GLPK_CFLAGS@
     247GLPK_CFLAGS_INSTALLED = @GLPK_CFLAGS_INSTALLED@
    217248GLPK_DATA = @GLPK_DATA@
     249GLPK_DATA_INSTALLED = @GLPK_DATA_INSTALLED@
     250GLPK_DEPENDENCIES = @GLPK_DEPENDENCIES@
    218251GLPK_LIBS = @GLPK_LIBS@
     252GLPK_LIBS_INSTALLED = @GLPK_LIBS_INSTALLED@
    219253GRB_CFLAGS = @GRB_CFLAGS@
     254GRB_CFLAGS_INSTALLED = @GRB_CFLAGS_INSTALLED@
    220255GRB_DATA = @GRB_DATA@
     256GRB_DATA_INSTALLED = @GRB_DATA_INSTALLED@
     257GRB_DEPENDENCIES = @GRB_DEPENDENCIES@
    221258GRB_LIBS = @GRB_LIBS@
     259GRB_LIBS_INSTALLED = @GRB_LIBS_INSTALLED@
    222260HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    223261HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    240278MAKEINFO = @MAKEINFO@
    241279MIPLIB3_CFLAGS = @MIPLIB3_CFLAGS@
     280MIPLIB3_CFLAGS_INSTALLED = @MIPLIB3_CFLAGS_INSTALLED@
    242281MIPLIB3_DATA = @MIPLIB3_DATA@
     282MIPLIB3_DATA_INSTALLED = @MIPLIB3_DATA_INSTALLED@
     283MIPLIB3_DEPENDENCIES = @MIPLIB3_DEPENDENCIES@
    243284MIPLIB3_LIBS = @MIPLIB3_LIBS@
     285MIPLIB3_LIBS_INSTALLED = @MIPLIB3_LIBS_INSTALLED@
    244286MPICC = @MPICC@
    245287MPICXX = @MPICXX@
    246288MSK_CFLAGS = @MSK_CFLAGS@
     289MSK_CFLAGS_INSTALLED = @MSK_CFLAGS_INSTALLED@
    247290MSK_DATA = @MSK_DATA@
     291MSK_DATA_INSTALLED = @MSK_DATA_INSTALLED@
     292MSK_DEPENDENCIES = @MSK_DEPENDENCIES@
    248293MSK_LIBS = @MSK_LIBS@
     294MSK_LIBS_INSTALLED = @MSK_LIBS_INSTALLED@
    249295NETLIB_CFLAGS = @NETLIB_CFLAGS@
     296NETLIB_CFLAGS_INSTALLED = @NETLIB_CFLAGS_INSTALLED@
    250297NETLIB_DATA = @NETLIB_DATA@
     298NETLIB_DATA_INSTALLED = @NETLIB_DATA_INSTALLED@
     299NETLIB_DEPENDENCIES = @NETLIB_DEPENDENCIES@
    251300NETLIB_LIBS = @NETLIB_LIBS@
     301NETLIB_LIBS_INSTALLED = @NETLIB_LIBS_INSTALLED@
    252302OBJEXT = @OBJEXT@
    253303OPT_CFLAGS = @OPT_CFLAGS@
     
    274324OSICBC_DFLT_SOLVER_XPR_TRUE = @OSICBC_DFLT_SOLVER_XPR_TRUE@
    275325OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     326OSITESTS_CFLAGS_INSTALLED = @OSITESTS_CFLAGS_INSTALLED@
    276327OSITESTS_DATA = @OSITESTS_DATA@
     328OSITESTS_DATA_INSTALLED = @OSITESTS_DATA_INSTALLED@
     329OSITESTS_DEPENDENCIES = @OSITESTS_DEPENDENCIES@
    277330OSITESTS_LIBS = @OSITESTS_LIBS@
     331OSITESTS_LIBS_INSTALLED = @OSITESTS_LIBS_INSTALLED@
    278332PACKAGE = @PACKAGE@
    279333PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    288342RPATH_FLAGS = @RPATH_FLAGS@
    289343SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     344SAMPLE_CFLAGS_INSTALLED = @SAMPLE_CFLAGS_INSTALLED@
    290345SAMPLE_DATA = @SAMPLE_DATA@
     346SAMPLE_DATA_INSTALLED = @SAMPLE_DATA_INSTALLED@
     347SAMPLE_DEPENDENCIES = @SAMPLE_DEPENDENCIES@
    291348SAMPLE_LIBS = @SAMPLE_LIBS@
     349SAMPLE_LIBS_INSTALLED = @SAMPLE_LIBS_INSTALLED@
    292350SET_MAKE = @SET_MAKE@
    293351SHELL = @SHELL@
    294352SPX_CFLAGS = @SPX_CFLAGS@
     353SPX_CFLAGS_INSTALLED = @SPX_CFLAGS_INSTALLED@
    295354SPX_DATA = @SPX_DATA@
     355SPX_DATA_INSTALLED = @SPX_DATA_INSTALLED@
     356SPX_DEPENDENCIES = @SPX_DEPENDENCIES@
    296357SPX_LIBS = @SPX_LIBS@
     358SPX_LIBS_INSTALLED = @SPX_LIBS_INSTALLED@
    297359STRIP = @STRIP@
    298360VERSION = @VERSION@
    299361VOL_CFLAGS = @VOL_CFLAGS@
     362VOL_CFLAGS_INSTALLED = @VOL_CFLAGS_INSTALLED@
    300363VOL_DATA = @VOL_DATA@
     364VOL_DATA_INSTALLED = @VOL_DATA_INSTALLED@
     365VOL_DEPENDENCIES = @VOL_DEPENDENCIES@
    301366VOL_LIBS = @VOL_LIBS@
     367VOL_LIBS_INSTALLED = @VOL_LIBS_INSTALLED@
    302368VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    303369XPR_CFLAGS = @XPR_CFLAGS@
     370XPR_CFLAGS_INSTALLED = @XPR_CFLAGS_INSTALLED@
    304371XPR_DATA = @XPR_DATA@
     372XPR_DATA_INSTALLED = @XPR_DATA_INSTALLED@
     373XPR_DEPENDENCIES = @XPR_DEPENDENCIES@
    305374XPR_LIBS = @XPR_LIBS@
     375XPR_LIBS_INSTALLED = @XPR_LIBS_INSTALLED@
    306376abs_bin_dir = @abs_bin_dir@
    307377abs_include_dir = @abs_include_dir@
     
    408478pkgconfiglibdir = $(libdir)/pkgconfig
    409479pkgconfiglib_DATA = cbc.pc osi-cbc.pc
    410 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc
     480addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc
    411481
    412482########################################################################
     
    820890        @echo "This command is intended for maintainers to use"
    821891        @echo "it deletes files that may require special tools to rebuild."
    822 @COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    823 @COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    824892clean: clean-recursive
    825893
     
    927995.PHONY: test unitTest doxydoc
    928996
    929 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    930 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
     997install-data-hook:
     998        @$(mkdir_p) "$(addlibsdir)"
    931999@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    9321000@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    933 
    934 @COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
    935 @COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/cbc_addlibs.txt
     1001@COIN_HAS_PKGCONFIG_FALSE@      echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
     1002
     1003uninstall-hook:
     1004        rm -f $(addlibsdir)/cbc_addlibs.txt
    9361005
    9371006install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.