Changeset 1651


Ignore:
Timestamp:
Jul 22, 2010 9:10:47 AM (9 years ago)
Author:
stefan
Message:

remove addlibs file in uninstall

Location:
ThirdParty/HSL/trunk
Files:
2 edited

Legend:

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

    r1643 r1651  
    8888        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    8989        $(PKG_CONFIG) --libs coinhsl > $(addlibsdir)/hsl_addlibs.txt
     90
     91uninstall-hook:
     92        rm -f $(addlibsdir)/hsl_addlibs.txt
    9093endif
    9194
     
    99102########################################################################
    100103
    101 CLEANFILES = $(HSL_SHARED_LIB) $(DEFFILE) hsl_addlibs.txt
     104CLEANFILES = $(HSL_SHARED_LIB) $(DEFFILE)
    102105
    103106# Files that are generated and should be cleaned with make distclean
  • ThirdParty/HSL/trunk/Makefile.in

    r1643 r1651  
    324324#                         Maintainer Stuff                             #
    325325########################################################################
    326 CLEANFILES = $(HSL_SHARED_LIB) $(DEFFILE) hsl_addlibs.txt
     326CLEANFILES = $(HSL_SHARED_LIB) $(DEFFILE)
    327327
    328328# Files that are generated and should be cleaned with make distclean
     
    686686@EXTRA_SHARED_COMMAND_FALSE@install-exec-local:
    687687@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
     688@COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    688689clean: clean-am
    689690
     
    743744uninstall-am: uninstall-info-am uninstall-local \
    744745        uninstall-pkgconfiglibDATA uninstall-thirdpartylibLTLIBRARIES
     746        @$(NORMAL_INSTALL)
     747        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    745748
    746749.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
     
    758761        mostlyclean mostlyclean-compile mostlyclean-generic \
    759762        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    760         uninstall-am uninstall-info-am uninstall-local \
     763        uninstall-am uninstall-hook uninstall-info-am uninstall-local \
    761764        uninstall-pkgconfiglibDATA uninstall-thirdpartylibLTLIBRARIES
    762765
     
    803806@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinhsl > $(addlibsdir)/hsl_addlibs.txt
    804807
     808@COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
     809@COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/hsl_addlibs.txt
     810
    805811install-doc: $(DocFiles)
    806812        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
Note: See TracChangeset for help on using the changeset viewer.