Changeset 2080 for ThirdParty/FilterSQP


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

drop creating of addlibs file; rerun autotools

Location:
ThirdParty/FilterSQP/trunk
Files:
2 edited

Legend:

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

    r2003 r2080  
    2828pkgconfiglib_DATA = coinfiltersqp.pc
    2929
    30 if COIN_HAS_PKGCONFIG
    31 addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/FilterSQP
    32        
    33 install-data-hook:
    34         @$(mkdir_p) "$(addlibsdir)"
    35         PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    36         $(PKG_CONFIG) --libs coinfiltersqp > $(addlibsdir)/filtersqp_addlibs.txt
    37 
    38 uninstall-hook:
    39         rm -f $(addlibsdir)/filtersqp_addlibs.txt
    40 endif
    41 
    42 test: $(libampl)
     30test:
    4331        @echo "No test available for FilterSQP."
    4432
  • ThirdParty/FilterSQP/trunk/Makefile.in

    r2055 r2080  
    266266pkgconfiglibdir = $(libdir)/pkgconfig
    267267pkgconfiglib_DATA = coinfiltersqp.pc
    268 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/FilterSQP
    269268
    270269########################################################################
     
    628627        @echo "This command is intended for maintainers to use"
    629628        @echo "it deletes files that may require special tools to rebuild."
    630 @COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    631 @COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    632629clean: clean-am
    633630
     
    652649
    653650install-data-am: install-pkgconfiglibDATA
    654         @$(NORMAL_INSTALL)
    655         $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    656651
    657652install-exec-am: install-libLTLIBRARIES
     
    684679uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
    685680        uninstall-pkgconfiglibDATA
    686         @$(NORMAL_INSTALL)
    687         $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    688681
    689682.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
     
    693686        distclean-libtool distclean-tags distcleancheck distdir \
    694687        distuninstallcheck dvi dvi-am html html-am info info-am \
    695         install install-am install-data install-data-am \
    696         install-data-hook install-exec install-exec-am install-info \
    697         install-info-am install-libLTLIBRARIES install-man \
    698         install-pkgconfiglibDATA install-strip installcheck \
    699         installcheck-am installdirs maintainer-clean \
    700         maintainer-clean-generic mostlyclean mostlyclean-compile \
    701         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    702         tags uninstall uninstall-am uninstall-hook uninstall-info-am \
    703         uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA
    704 
    705 
    706 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    707 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
    708 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    709 @COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinfiltersqp > $(addlibsdir)/filtersqp_addlibs.txt
    710 
    711 @COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
    712 @COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/filtersqp_addlibs.txt
    713 
    714 test: $(libampl)
     688        install install-am install-data install-data-am install-exec \
     689        install-exec-am install-info install-info-am \
     690        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
     691        install-strip installcheck installcheck-am installdirs \
     692        maintainer-clean maintainer-clean-generic mostlyclean \
     693        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     694        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     695        uninstall-info-am uninstall-libLTLIBRARIES \
     696        uninstall-pkgconfiglibDATA
     697
     698
     699test:
    715700        @echo "No test available for FilterSQP."
    716701
Note: See TracChangeset for help on using the changeset viewer.