Changeset 1541 for trunk/Cbc/Makefile.in


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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.in

    r1516 r1541  
    125125ASL_CFLAGS = @ASL_CFLAGS@
    126126ASL_DATA = @ASL_DATA@
     127ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
    127128ASL_LIBS = @ASL_LIBS@
    128129AUTOCONF = @AUTOCONF@
     
    133134BUILDTOOLSDIR = @BUILDTOOLSDIR@
    134135CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
     136CBCGENERIC_CFLAGS_INSTALLED = @CBCGENERIC_CFLAGS_INSTALLED@
    135137CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
     138CBCGENERIC_LIBS_INSTALLED = @CBCGENERIC_LIBS_INSTALLED@
    136139CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
    137140CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
    138141CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
     142CBCLIB_CFLAGS_INSTALLED = @CBCLIB_CFLAGS_INSTALLED@
    139143CBCLIB_LIBS = @CBCLIB_LIBS@
     144CBCLIB_LIBS_INSTALLED = @CBCLIB_LIBS_INSTALLED@
    140145CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
    141146CBCLIB_PCREQUIRES = @CBCLIB_PCREQUIRES@
     
    149154CLP_CFLAGS = @CLP_CFLAGS@
    150155CLP_DATA = @CLP_DATA@
     156CLP_DATA_INSTALLED = @CLP_DATA_INSTALLED@
    151157CLP_LIBS = @CLP_LIBS@
    152158COINDEPEND_CFLAGS = @COINDEPEND_CFLAGS@
    153159COINDEPEND_DATA = @COINDEPEND_DATA@
     160COINDEPEND_DATA_INSTALLED = @COINDEPEND_DATA_INSTALLED@
    154161COINDEPEND_LIBS = @COINDEPEND_LIBS@
     162COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
     163COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
     164COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
     165COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
    155166COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    156167COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
     
    191202CPX_CFLAGS = @CPX_CFLAGS@
    192203CPX_DATA = @CPX_DATA@
     204CPX_DATA_INSTALLED = @CPX_DATA_INSTALLED@
    193205CPX_LIBS = @CPX_LIBS@
    194206CXX = @CXX@
     
    204216DYLP_CFLAGS = @DYLP_CFLAGS@
    205217DYLP_DATA = @DYLP_DATA@
     218DYLP_DATA_INSTALLED = @DYLP_DATA_INSTALLED@
    206219DYLP_LIBS = @DYLP_LIBS@
    207220ECHO = @ECHO@
     
    216229GLPK_CFLAGS = @GLPK_CFLAGS@
    217230GLPK_DATA = @GLPK_DATA@
     231GLPK_DATA_INSTALLED = @GLPK_DATA_INSTALLED@
    218232GLPK_LIBS = @GLPK_LIBS@
    219233GRB_CFLAGS = @GRB_CFLAGS@
    220234GRB_DATA = @GRB_DATA@
     235GRB_DATA_INSTALLED = @GRB_DATA_INSTALLED@
    221236GRB_LIBS = @GRB_LIBS@
    222237HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    241256MIPLIB3_CFLAGS = @MIPLIB3_CFLAGS@
    242257MIPLIB3_DATA = @MIPLIB3_DATA@
     258MIPLIB3_DATA_INSTALLED = @MIPLIB3_DATA_INSTALLED@
    243259MIPLIB3_LIBS = @MIPLIB3_LIBS@
    244260MPICC = @MPICC@
     
    246262MSK_CFLAGS = @MSK_CFLAGS@
    247263MSK_DATA = @MSK_DATA@
     264MSK_DATA_INSTALLED = @MSK_DATA_INSTALLED@
    248265MSK_LIBS = @MSK_LIBS@
    249266NETLIB_CFLAGS = @NETLIB_CFLAGS@
    250267NETLIB_DATA = @NETLIB_DATA@
     268NETLIB_DATA_INSTALLED = @NETLIB_DATA_INSTALLED@
    251269NETLIB_LIBS = @NETLIB_LIBS@
    252270OBJEXT = @OBJEXT@
     
    275293OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    276294OSITESTS_DATA = @OSITESTS_DATA@
     295OSITESTS_DATA_INSTALLED = @OSITESTS_DATA_INSTALLED@
    277296OSITESTS_LIBS = @OSITESTS_LIBS@
    278297PACKAGE = @PACKAGE@
     
    289308SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
    290309SAMPLE_DATA = @SAMPLE_DATA@
     310SAMPLE_DATA_INSTALLED = @SAMPLE_DATA_INSTALLED@
    291311SAMPLE_LIBS = @SAMPLE_LIBS@
    292312SET_MAKE = @SET_MAKE@
     
    294314SPX_CFLAGS = @SPX_CFLAGS@
    295315SPX_DATA = @SPX_DATA@
     316SPX_DATA_INSTALLED = @SPX_DATA_INSTALLED@
    296317SPX_LIBS = @SPX_LIBS@
    297318STRIP = @STRIP@
     
    299320VOL_CFLAGS = @VOL_CFLAGS@
    300321VOL_DATA = @VOL_DATA@
     322VOL_DATA_INSTALLED = @VOL_DATA_INSTALLED@
    301323VOL_LIBS = @VOL_LIBS@
    302324VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    303325XPR_CFLAGS = @XPR_CFLAGS@
    304326XPR_DATA = @XPR_DATA@
     327XPR_DATA_INSTALLED = @XPR_DATA_INSTALLED@
    305328XPR_LIBS = @XPR_LIBS@
    306329abs_bin_dir = @abs_bin_dir@
     
    408431pkgconfiglibdir = $(libdir)/pkgconfig
    409432pkgconfiglib_DATA = cbc.pc osi-cbc.pc
    410 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc
     433addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc
    411434
    412435########################################################################
     
    820843        @echo "This command is intended for maintainers to use"
    821844        @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:
    824845clean: clean-recursive
    825846
     
    927948.PHONY: test unitTest doxydoc
    928949
    929 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    930 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
     950install-data-hook:
     951        @$(mkdir_p) "$(addlibsdir)"
    931952@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    932953@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
     954@COIN_HAS_PKGCONFIG_FALSE@      echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
     955
     956uninstall-hook:
     957        rm -f $(addlibsdir)/cbc_addlibs.txt
    936958
    937959install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.