Changeset 2078 for ThirdParty/ASL


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

drop creating of addlibs file; rerun autotools

Location:
ThirdParty/ASL/trunk
Files:
2 edited

Legend:

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

    r2001 r2078  
    3131stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
    3232
     33test:
     34        @echo "No test available for ASL."
     35
    3336thirdpartyincludedir = $(includedir)/coin/ThirdParty
    3437thirdpartyinclude_HEADERS = \
     
    4346pkgconfiglib_DATA = coinasl.pc
    4447
    45 if COIN_HAS_PKGCONFIG
    46 addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/ASL
    47        
    48 install-data-hook:
    49         @$(mkdir_p) "$(addlibsdir)"
    50         PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    51         $(PKG_CONFIG) --libs coinasl > $(addlibsdir)/asl_addlibs.txt
    52        
    53 uninstall-hook:
    54         rm -f $(addlibsdir)/asl_addlibs.txt
    55 endif
    56 
    5748CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    5849
  • ThirdParty/ASL/trunk/Makefile.in

    r2051 r2078  
    260260pkgconfiglibdir = $(libdir)/pkgconfig
    261261pkgconfiglib_DATA = coinasl.pc
    262 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/ASL
    263262CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    264263
     
    585584        @echo "This command is intended for maintainers to use"
    586585        @echo "it deletes files that may require special tools to rebuild."
    587 @COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    588 @COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    589586clean: clean-am
    590587
     
    609606install-data-am: install-pkgconfiglibDATA \
    610607        install-thirdpartyincludeHEADERS install-thirdpartylibDATA
    611         @$(NORMAL_INSTALL)
    612         $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    613608
    614609install-exec-am:
     
    640635uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
    641636        uninstall-thirdpartyincludeHEADERS uninstall-thirdpartylibDATA
    642         @$(NORMAL_INSTALL)
    643         $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    644637
    645638.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
     
    649642        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    650643        html-am info info-am install install-am install-data \
    651         install-data-am install-data-hook install-exec install-exec-am \
    652         install-info install-info-am install-man \
    653         install-pkgconfiglibDATA install-strip \
    654         install-thirdpartyincludeHEADERS install-thirdpartylibDATA \
    655         installcheck installcheck-am installdirs maintainer-clean \
    656         maintainer-clean-generic mostlyclean mostlyclean-generic \
    657         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    658         uninstall-am uninstall-hook uninstall-info-am \
     644        install-data-am install-exec install-exec-am install-info \
     645        install-info-am install-man install-pkgconfiglibDATA \
     646        install-strip install-thirdpartyincludeHEADERS \
     647        install-thirdpartylibDATA installcheck installcheck-am \
     648        installdirs maintainer-clean maintainer-clean-generic \
     649        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
     650        ps ps-am tags uninstall uninstall-am uninstall-info-am \
    659651        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    660652        uninstall-thirdpartylibDATA
     
    670662stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
    671663
    672 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    673 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
    674 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    675 @COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinasl > $(addlibsdir)/asl_addlibs.txt
    676 
    677 @COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
    678 @COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/asl_addlibs.txt
     664test:
     665        @echo "No test available for ASL."
    679666
    680667install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.