Ignore:
Timestamp:
Jul 22, 2010 6:01:41 AM (10 years ago)
Author:
stefan
Message:

create xxx_addlibs.txt after installation by using only .pc files of installed projects; rerun autotools

File:
1 edited

Legend:

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

    r1618 r1635  
    7979am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    8080am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    81         "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" \
     81        "$(DESTDIR)$(pkgconfiglibdir)" \
    8282        "$(DESTDIR)$(thirdpartyincludedir)"
    8383thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
     
    120120SOURCES = $(libcoinglpk_la_SOURCES)
    121121DIST_SOURCES = $(libcoinglpk_la_SOURCES)
    122 addlibsDATA_INSTALL = $(INSTALL_DATA)
    123122pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    124 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
     123DATA = $(pkgconfiglib_DATA)
    125124thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    126125HEADERS = $(thirdpartyinclude_HEADERS)
     
    163162COIN_HAS_ZLIB_TRUE = @COIN_HAS_ZLIB_TRUE@
    164163COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     164COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    165165CPP = @CPP@
    166166CPPFLAGS = @CPPFLAGS@
     
    403403thirdpartyincludedir = $(includedir)/coin/ThirdParty
    404404thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
    405 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/ThirdParty/Glpk
    406 @COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = glpk_addlibs.txt
    407405pkgconfiglibdir = $(libdir)/pkgconfig
    408406pkgconfiglib_DATA = coinglpk.pc
     407@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Glpk
    409408
    410409########################################################################
     
    14071406        -rm -f libtool
    14081407uninstall-info-am:
    1409 install-addlibsDATA: $(addlibs_DATA)
    1410         @$(NORMAL_INSTALL)
    1411         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    1412         @list='$(addlibs_DATA)'; for p in $$list; do \
    1413           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    1414           f=$(am__strip_dir) \
    1415           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    1416           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    1417         done
    1418 
    1419 uninstall-addlibsDATA:
    1420         @$(NORMAL_UNINSTALL)
    1421         @list='$(addlibs_DATA)'; for p in $$list; do \
    1422           f=$(am__strip_dir) \
    1423           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    1424           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    1425         done
    14261408install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
    14271409        @$(NORMAL_INSTALL)
     
    16381620all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config_glpk.h
    16391621installdirs:
    1640         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     1622        for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    16411623          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    16421624        done
     
    16671649        @echo "This command is intended for maintainers to use"
    16681650        @echo "it deletes files that may require special tools to rebuild."
     1651@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    16691652clean: clean-am
    16701653
     
    16891672info-am:
    16901673
    1691 install-data-am: install-addlibsDATA install-pkgconfiglibDATA \
     1674install-data-am: install-pkgconfiglibDATA \
    16921675        install-thirdpartyincludeHEADERS \
    16931676        install-thirdpartylibLTLIBRARIES
     1677        @$(NORMAL_INSTALL)
     1678        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    16941679
    16951680install-exec-am:
     
    17211706ps-am:
    17221707
    1723 uninstall-am: uninstall-addlibsDATA uninstall-info-am \
    1724         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
     1708uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
     1709        uninstall-thirdpartyincludeHEADERS \
    17251710        uninstall-thirdpartylibLTLIBRARIES
    17261711
     
    17311716        distclean-generic distclean-hdr distclean-libtool \
    17321717        distclean-tags distcleancheck distdir distuninstallcheck dvi \
    1733         dvi-am html html-am info info-am install install-addlibsDATA \
    1734         install-am install-data install-data-am install-exec \
     1718        dvi-am html html-am info info-am install install-am \
     1719        install-data install-data-am install-data-hook install-exec \
    17351720        install-exec-am install-info install-info-am install-man \
    17361721        install-pkgconfiglibDATA install-strip \
     
    17401725        mostlyclean mostlyclean-compile mostlyclean-generic \
    17411726        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    1742         uninstall-addlibsDATA uninstall-am uninstall-info-am \
    1743         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
     1727        uninstall-am uninstall-info-am uninstall-pkgconfiglibDATA \
     1728        uninstall-thirdpartyincludeHEADERS \
    17441729        uninstall-thirdpartylibLTLIBRARIES
    17451730
    17461731
    1747 @COIN_HAS_PKGCONFIG_TRUE@glpk_addlibs.txt : coinglpk.pc
    1748 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinglpk > glpk_addlibs.txt
     1732@COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
     1733@COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
     1734@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     1735@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinglpk > $(addlibsdir)/glpk_addlibs.txt
    17491736
    17501737install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.