Changeset 2084


Ignore:
Timestamp:
Jan 8, 2011 1:00:44 PM (9 years ago)
Author:
stefan
Message:

drop creating of addlibs file; rerun autotools

Location:
ThirdParty/Metis/trunk
Files:
2 edited

Legend:

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

    r2007 r2084  
    8686pkgconfiglib_DATA = coinmetis.pc
    8787
    88 if COIN_HAS_PKGCONFIG
    89 addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Metis
    90        
    91 install-data-hook:
    92         @$(mkdir_p) "$(addlibsdir)"
    93         PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    94         $(PKG_CONFIG) --libs coinmetis > $(addlibsdir)/metis_addlibs.txt
    95        
    96 uninstall-hook:
    97         rm -f $(addlibsdir)/metis_addlibs.txt
    98 endif
    99 
    100 test: $(libampl)
     88test:
    10189        @echo "No test available for Metis."
    10290
  • ThirdParty/Metis/trunk/Makefile.in

    r2057 r2084  
    335335pkgconfiglibdir = $(libdir)/pkgconfig
    336336pkgconfiglib_DATA = coinmetis.pc
    337 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Metis
    338337
    339338########################################################################
     
    11141113        @echo "This command is intended for maintainers to use"
    11151114        @echo "it deletes files that may require special tools to rebuild."
    1116 @COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    1117 @COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    11181115clean: clean-am
    11191116
     
    11401137install-data-am: install-pkgconfiglibDATA \
    11411138        install-thirdpartyincludeHEADERS
    1142         @$(NORMAL_INSTALL)
    1143         $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    11441139
    11451140install-exec-am: install-libLTLIBRARIES
     
    11731168uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
    11741169        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
    1175         @$(NORMAL_INSTALL)
    1176         $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    11771170
    11781171.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
     
    11821175        distclean-libtool distclean-tags distcleancheck distdir \
    11831176        distuninstallcheck dvi dvi-am html html-am info info-am \
    1184         install install-am install-data install-data-am \
    1185         install-data-hook install-exec install-exec-am install-info \
    1186         install-info-am install-libLTLIBRARIES install-man \
    1187         install-pkgconfiglibDATA install-strip \
    1188         install-thirdpartyincludeHEADERS installcheck installcheck-am \
    1189         installdirs maintainer-clean maintainer-clean-generic \
    1190         mostlyclean mostlyclean-compile mostlyclean-generic \
    1191         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    1192         uninstall-am uninstall-hook uninstall-info-am \
     1177        install install-am install-data install-data-am install-exec \
     1178        install-exec-am install-info install-info-am \
     1179        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
     1180        install-strip install-thirdpartyincludeHEADERS installcheck \
     1181        installcheck-am installdirs maintainer-clean \
     1182        maintainer-clean-generic mostlyclean mostlyclean-compile \
     1183        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     1184        tags uninstall uninstall-am uninstall-info-am \
    11931185        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA \
    11941186        uninstall-thirdpartyincludeHEADERS
    11951187
    11961188
    1197 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    1198 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
    1199 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    1200 @COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinmetis > $(addlibsdir)/metis_addlibs.txt
    1201 
    1202 @COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
    1203 @COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/metis_addlibs.txt
    1204 
    1205 test: $(libampl)
     1189test:
    12061190        @echo "No test available for Metis."
    12071191
Note: See TracChangeset for help on using the changeset viewer.