Changeset 1486 for trunk/Cbc/Makefile.in


Ignore:
Timestamp:
Jul 22, 2010 6:04:38 AM (9 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
  • trunk/Cbc/Makefile.in

    r1484 r1486  
    9494  esac;
    9595am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    96 am__installdirs = "$(DESTDIR)$(addlibsdir)" \
    97         "$(DESTDIR)$(pkgconfiglibdir)"
    98 addlibsDATA_INSTALL = $(INSTALL_DATA)
     96am__installdirs = "$(DESTDIR)$(pkgconfiglibdir)"
    9997pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    100 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
     98DATA = $(pkgconfiglib_DATA)
    10199ETAGS = etags
    102100CTAGS = ctags
     
    179177COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
    180178COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     179COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    181180CPP = @CPP@
    182181CPPFLAGS = @CPPFLAGS@
     
    393392#                  Installation of the addlibs file                    #
    394393########################################################################
    395 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/Cbc
    396 @COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = cbc_addlibs.txt
    397394pkgconfiglibdir = $(libdir)/pkgconfig
    398395pkgconfiglib_DATA = cbc.pc osi-cbc.pc
     396@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc
    399397
    400398########################################################################
     
    480478        -rm -f libtool
    481479uninstall-info-am:
    482 install-addlibsDATA: $(addlibs_DATA)
    483         @$(NORMAL_INSTALL)
    484         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    485         @list='$(addlibs_DATA)'; for p in $$list; do \
    486           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    487           f=$(am__strip_dir) \
    488           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    489           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    490         done
    491 
    492 uninstall-addlibsDATA:
    493         @$(NORMAL_UNINSTALL)
    494         @list='$(addlibs_DATA)'; for p in $$list; do \
    495           f=$(am__strip_dir) \
    496           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    497           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    498         done
    499480install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
    500481        @$(NORMAL_INSTALL)
     
    794775installdirs: installdirs-recursive
    795776installdirs-am:
    796         for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
     777        for dir in "$(DESTDIR)$(pkgconfiglibdir)"; do \
    797778          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    798779        done
     
    823804        @echo "This command is intended for maintainers to use"
    824805        @echo "it deletes files that may require special tools to rebuild."
     806@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    825807clean: clean-recursive
    826808
     
    843825info-am:
    844826
    845 install-data-am: install-addlibsDATA install-pkgconfiglibDATA
     827install-data-am: install-pkgconfiglibDATA
     828        @$(NORMAL_INSTALL)
     829        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    846830
    847831install-exec-am: install-exec-local
     
    871855ps-am:
    872856
    873 uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
     857uninstall-am: uninstall-info-am uninstall-local \
    874858        uninstall-pkgconfiglibDATA
    875859
     
    883867        distclean-local distclean-recursive distclean-tags \
    884868        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    885         html-am info info-am install install-addlibsDATA install-am \
    886         install-data install-data-am install-exec install-exec-am \
     869        html-am info info-am install install-am install-data \
     870        install-data-am install-data-hook install-exec install-exec-am \
    887871        install-exec-local install-info install-info-am install-man \
    888872        install-pkgconfiglibDATA install-strip installcheck \
     
    891875        mostlyclean mostlyclean-generic mostlyclean-libtool \
    892876        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
    893         uninstall uninstall-addlibsDATA uninstall-am uninstall-info-am \
    894         uninstall-local uninstall-pkgconfiglibDATA
     877        uninstall uninstall-am uninstall-info-am uninstall-local \
     878        uninstall-pkgconfiglibDATA
    895879
    896880
     
    916900.PHONY: test unitTest
    917901
    918 @COIN_HAS_PKGCONFIG_TRUE@cbc_addlibs.txt : cbc.pc
    919 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs cbc > cbc_addlibs.txt
     902@COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
     903@COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
     904@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ PKG_CONFIG_DISABLE_UNINSTALLED= \
     905@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    920906
    921907install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.