Changeset 1464 for trunk/Cbc/Makefile.am


Ignore:
Timestamp:
Jun 7, 2010 8:27:42 AM (9 years ago)
Author:
stefan
Message:

merge split branch into trunk; fix some examples

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        8 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
        11 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
         7#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
         8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         9Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         10Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1437-1439,​1444-1448,​1463
  • trunk/Cbc

  • trunk/Cbc/Makefile.am

    r876 r1464  
    107107        if test -r test/Makefile; then cd test; $(MAKE) distclean; fi
    108108
     109install-exec-local: install-doc
     110
     111uninstall-local: uninstall-doc
     112
    109113.PHONY: test unitTest
    110114
     
    113117########################################################################
    114118
    115 addlibsfile = cbc_addlibs.txt
    116 addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
     119if COIN_HAS_PKGCONFIG
     120addlibsdir = $(datadir)/coin/doc/Cbc
     121addlibs_DATA = cbc_addlibs.txt
    117122
    118 install-exec-local: install-doc
    119         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
     123cbc_addlibs.txt : cbc.pc
     124        PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs cbc > cbc_addlibs.txt
     125endif
    120126
    121 uninstall-local: uninstall-doc
    122         rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
     127pkgconfiglibdir = $(libdir)/pkgconfig
     128pkgconfiglib_DATA = cbc.pc osi-cbc.pc
    123129
    124130########################################################################
     
    126132########################################################################
    127133
     134CLEANFILES = cbc_addlibs.txt
     135
    128136# Files that are generated and should be cleaned with make distclean
    129137DISTCLEANFILES =
Note: See TracChangeset for help on using the changeset viewer.