Changeset 1488 for trunk


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

remove addlibs file in uninstall

Location:
trunk/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.am

    r1487 r1488  
    127127        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    128128        $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
     129
     130uninstall-hook:
     131        rm -f $(addlibsdir)/cbc_addlibs.txt
    129132endif
    130133
     
    133136########################################################################
    134137
    135 CLEANFILES = cbc_addlibs.txt
     138CLEANFILES =
    136139
    137140# Files that are generated and should be cleaned with make distclean
  • trunk/Cbc/Makefile.in

    r1487 r1488  
    399399#                         Maintainer Stuff                             #
    400400########################################################################
    401 CLEANFILES = cbc_addlibs.txt
     401CLEANFILES =
    402402
    403403# Files that are generated and should be cleaned with make distclean
     
    805805        @echo "it deletes files that may require special tools to rebuild."
    806806@COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
     807@COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    807808clean: clean-recursive
    808809
     
    857858uninstall-am: uninstall-info-am uninstall-local \
    858859        uninstall-pkgconfiglibDATA
     860        @$(NORMAL_INSTALL)
     861        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    859862
    860863uninstall-info: uninstall-info-recursive
     
    875878        mostlyclean mostlyclean-generic mostlyclean-libtool \
    876879        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
    877         uninstall uninstall-am uninstall-info-am uninstall-local \
    878         uninstall-pkgconfiglibDATA
     880        uninstall uninstall-am uninstall-hook uninstall-info-am \
     881        uninstall-local uninstall-pkgconfiglibDATA
    879882
    880883
     
    904907@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    905908@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
     909
     910@COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
     911@COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/cbc_addlibs.txt
    906912
    907913install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.