Changeset 1637 for trunk/Clp/Makefile.in


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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r1636 r1637  
    136136CFLAGS = @CFLAGS@
    137137CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
     138CLPLIB_CFLAGS_INSTALLED = @CLPLIB_CFLAGS_INSTALLED@
    138139CLPLIB_LIBS = @CLPLIB_LIBS@
     140CLPLIB_LIBS_INSTALLED = @CLPLIB_LIBS_INSTALLED@
    139141CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
    140142CLPLIB_PCREQUIRES = @CLPLIB_PCREQUIRES@
     
    142144COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    143145COINUTILS_DATA = @COINUTILS_DATA@
     146COINUTILS_DATA_INSTALLED = @COINUTILS_DATA_INSTALLED@
    144147COINUTILS_LIBS = @COINUTILS_LIBS@
     148COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
     149COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
     150COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
     151COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
    145152COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    146153COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
     
    201208NETLIB_CFLAGS = @NETLIB_CFLAGS@
    202209NETLIB_DATA = @NETLIB_DATA@
     210NETLIB_DATA_INSTALLED = @NETLIB_DATA_INSTALLED@
    203211NETLIB_LIBS = @NETLIB_LIBS@
    204212OBJEXT = @OBJEXT@
     
    206214OPT_CXXFLAGS = @OPT_CXXFLAGS@
    207215OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
     216OSICLPLIB_CFLAGS_INSTALLED = @OSICLPLIB_CFLAGS_INSTALLED@
    208217OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
     218OSICLPLIB_LIBS_INSTALLED = @OSICLPLIB_LIBS_INSTALLED@
    209219OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@
    210220OSICLPLIB_PCREQUIRES = @OSICLPLIB_PCREQUIRES@
    211221OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    212222OSITESTS_DATA = @OSITESTS_DATA@
     223OSITESTS_DATA_INSTALLED = @OSITESTS_DATA_INSTALLED@
    213224OSITESTS_LIBS = @OSITESTS_LIBS@
    214225OSI_CFLAGS = @OSI_CFLAGS@
    215226OSI_DATA = @OSI_DATA@
     227OSI_DATA_INSTALLED = @OSI_DATA_INSTALLED@
    216228OSI_LIBS = @OSI_LIBS@
    217229PACKAGE = @PACKAGE@
     
    228240SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
    229241SAMPLE_DATA = @SAMPLE_DATA@
     242SAMPLE_DATA_INSTALLED = @SAMPLE_DATA_INSTALLED@
    230243SAMPLE_LIBS = @SAMPLE_LIBS@
    231244SET_MAKE = @SET_MAKE@
     
    331344pkgconfiglibdir = $(libdir)/pkgconfig
    332345pkgconfiglib_DATA = clp.pc $(am__append_2)
    333 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Clp
     346addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Clp
    334347
    335348########################################################################
     
    743756        @echo "This command is intended for maintainers to use"
    744757        @echo "it deletes files that may require special tools to rebuild."
    745 @COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    746 @COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    747758clean: clean-recursive
    748759
     
    850861.PHONY: test unitTest doxydoc
    851862
    852 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    853 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
     863install-data-hook:
     864        @$(mkdir_p) "$(addlibsdir)"
    854865@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    855866@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
    856 
    857 @COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
    858 @COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/clp_addlibs.txt
     867@COIN_HAS_PKGCONFIG_FALSE@      echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
     868
     869uninstall-hook:
     870        rm -f $(addlibsdir)/clp_addlibs.txt
    859871
    860872install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.