Changeset 2081 for ThirdParty/Glpk


Ignore:
Timestamp:
Jan 8, 2011 12:59:21 PM (9 years ago)
Author:
stefan
Message:

drop creating of addlibs file; rerun autotools

Location:
ThirdParty/Glpk/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/Makefile.am

    r2004 r2081  
    139139pkgconfiglib_DATA = coinglpk.pc
    140140
    141 if COIN_HAS_PKGCONFIG
    142 addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Glpk
    143        
    144 install-data-hook:
    145         @$(mkdir_p) "$(addlibsdir)"
    146         PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    147         $(PKG_CONFIG) --libs coinglpk > $(addlibsdir)/glpk_addlibs.txt
    148        
    149 uninstall-hook:
    150         rm -f $(addlibsdir)/glpk_addlibs.txt
    151 endif
    152 
    153 test: $(libampl)
     141test:
    154142        @echo "No test available for Glpk."
    155143
  • ThirdParty/Glpk/trunk/Makefile.in

    r2059 r2081  
    403403pkgconfiglibdir = $(libdir)/pkgconfig
    404404pkgconfiglib_DATA = coinglpk.pc
    405 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Glpk
    406405
    407406########################################################################
     
    16471646        @echo "This command is intended for maintainers to use"
    16481647        @echo "it deletes files that may require special tools to rebuild."
    1649 @COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    1650 @COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    16511648clean: clean-am
    16521649
     
    16731670install-data-am: install-pkgconfiglibDATA \
    16741671        install-thirdpartyincludeHEADERS
    1675         @$(NORMAL_INSTALL)
    1676         $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    16771672
    16781673install-exec-am: install-libLTLIBRARIES
     
    17061701uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
    17071702        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
    1708         @$(NORMAL_INSTALL)
    1709         $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    17101703
    17111704.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
     
    17161709        distdir distuninstallcheck dvi dvi-am html html-am info \
    17171710        info-am install install-am install-data install-data-am \
    1718         install-data-hook install-exec install-exec-am install-info \
    1719         install-info-am install-libLTLIBRARIES install-man \
    1720         install-pkgconfiglibDATA install-strip \
    1721         install-thirdpartyincludeHEADERS installcheck installcheck-am \
    1722         installdirs maintainer-clean maintainer-clean-generic \
    1723         mostlyclean mostlyclean-compile mostlyclean-generic \
    1724         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    1725         uninstall-am uninstall-hook uninstall-info-am \
     1711        install-exec install-exec-am install-info install-info-am \
     1712        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
     1713        install-strip install-thirdpartyincludeHEADERS installcheck \
     1714        installcheck-am installdirs maintainer-clean \
     1715        maintainer-clean-generic mostlyclean mostlyclean-compile \
     1716        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     1717        tags uninstall uninstall-am uninstall-info-am \
    17261718        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA \
    17271719        uninstall-thirdpartyincludeHEADERS
    17281720
    17291721
    1730 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    1731 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
    1732 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    1733 @COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinglpk > $(addlibsdir)/glpk_addlibs.txt
    1734 
    1735 @COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
    1736 @COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/glpk_addlibs.txt
    1737 
    1738 test: $(libampl)
     1722test:
    17391723        @echo "No test available for Glpk."
    17401724
Note: See TracChangeset for help on using the changeset viewer.