From 040a7cda095fde2db65ca043d0aa491848b12bfe Mon Sep 17 00:00:00 2001 From: William Cohen Date: Wed, 16 Mar 2011 11:25:22 -0400 Subject: Complete "make uninstall" cleanup so "make distcheck" works The "make distcheck" would not complete because the "make uninstall" would leave .so files around. Proper removal of the installed .so files allows the "make distcheck" to complete successfully. --- Makefile.am | 4 ++++ Makefile.in | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9cbd081..508bee7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,4 +77,8 @@ install-exec-hook: rm -f $(DESTDIR)$(libdir)/libmemstomp.la rm -f $(DESTDIR)$(libdir)/libmemstomp-backtrace-symbols.la +uninstall-hook: + rm -f $(DESTDIR)$(libdir)/libmemstomp.so + rm -f $(DESTDIR)$(libdir)/libmemstomp-backtrace-symbols.so + ACLOCAL_AMFLAGS = -I m4 diff --git a/Makefile.in b/Makefile.in index ba7b1db..b460a01 100644 --- a/Makefile.in +++ b/Makefile.in @@ -828,8 +828,9 @@ ps: ps-am ps-am: uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES - -.MAKE: all install-am install-exec-am install-strip + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +.MAKE: all install-am install-exec-am install-strip uninstall-am .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ @@ -847,7 +848,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-libLTLIBRARIES + uninstall-hook uninstall-libLTLIBRARIES memstomp: memstomp.in Makefile @@ -859,6 +860,10 @@ install-exec-hook: rm -f $(DESTDIR)$(libdir)/libmemstomp.la rm -f $(DESTDIR)$(libdir)/libmemstomp-backtrace-symbols.la +uninstall-hook: + rm -f $(DESTDIR)$(libdir)/libmemstomp.so + rm -f $(DESTDIR)$(libdir)/libmemstomp-backtrace-symbols.so + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -- cgit