Changeset 2081

Timestamp:

Jan 8, 2011 12:59:21 PM (10 years ago)

Author:

stefan

Message:

drop creating of addlibs file; rerun autotools

Location:

ThirdParty/Glpk/trunk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (5 diffs)

ThirdParty/Glpk/trunk/Makefile.am

@@ -139 +139 @@
 pkgconfiglib_DATA = coinglpk.pc
 
-if COIN_HAS_PKGCONFIG
-addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Glpk
-        
-install-data-hook:
-        @$(mkdir_p) "$(addlibsdir)"
-        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
-        $(PKG_CONFIG) --libs coinglpk > $(addlibsdir)/glpk_addlibs.txt
-        
-uninstall-hook:
-        rm -f $(addlibsdir)/glpk_addlibs.txt
-endif
-
-test: $(libampl)
+test:
         @echo "No test available for Glpk."
 

ThirdParty/Glpk/trunk/Makefile.in

@@ -403 +403 @@
 pkgconfiglibdir = $(libdir)/pkgconfig
 pkgconfiglib_DATA = coinglpk.pc
-@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Glpk
 
 ########################################################################
@@ -1647 +1646 @@
         @echo "This command is intended for maintainers to use"
         @echo "it deletes files that may require special tools to rebuild."
-@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
-@COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
 clean: clean-am
 
@@ -1673 +1670 @@
 install-data-am: install-pkgconfiglibDATA \
         install-thirdpartyincludeHEADERS
-        @$(NORMAL_INSTALL)
-        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-exec-am: install-libLTLIBRARIES
@@ -1706 +1701 @@
 uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
-        @$(NORMAL_INSTALL)
-        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
@@ -1716 +1709 @@
         distdir distuninstallcheck dvi dvi-am html html-am info \
         info-am install install-am install-data install-data-am \
-        install-data-hook install-exec install-exec-am install-info \
-        install-info-am install-libLTLIBRARIES install-man \
-        install-pkgconfiglibDATA install-strip \
-        install-thirdpartyincludeHEADERS installcheck installcheck-am \
-        installdirs maintainer-clean maintainer-clean-generic \
-        mostlyclean mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-        uninstall-am uninstall-hook uninstall-info-am \
+        install-exec install-exec-am install-info install-info-am \
+        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
+        install-strip install-thirdpartyincludeHEADERS installcheck \
+        installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-compile \
+        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+        tags uninstall uninstall-am uninstall-info-am \
         uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA \
         uninstall-thirdpartyincludeHEADERS
 
 
-@COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
-@COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
-@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
-@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinglpk > $(addlibsdir)/glpk_addlibs.txt
-
-@COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
-@COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/glpk_addlibs.txt
-
-test: $(libampl)
+test:
         @echo "No test available for Glpk."