From 895f25f4a26e53e4f85bb5c919b28f4ab7488912 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Fri, 9 May 2014 14:25:39 +0000
Subject: [PATCH] Add uninstall-local rules to make distcheck happy.

Also remove generated FAQ.txt in docs distclean-local rule.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13950
---
 Makefile.all.am       | 14 ++++++++++++++
 Makefile.tool.am      |  2 ++
 coregrind/Makefile.am |  2 ++
 docs/Makefile.am      |  1 +
 mpi/Makefile.am       |  2 ++
 5 files changed, 21 insertions(+)

diff --git a/Makefile.all.am b/Makefile.all.am
index 96eb8403f..06d588d8e 100644
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -58,6 +58,14 @@ install-noinst_PROGRAMS: $(noinst_PROGRAMS)
 	  $(INSTALL_PROGRAM) $$f $(DESTDIR)$(pkglibdir); \
 	done
 
+# This is used by coregrind/Makefile.am and by <tool>/Makefile.am for doing
+# "make uninstall".  It removes $(noinst_PROGRAMS) from $prefix/lib/valgrind/.
+# It needs to be depended on by an 'uninstall-local' rule.
+uninstall-noinst_PROGRAMS:
+	for f in $(noinst_PROGRAMS); do \
+	  rm -f $(DESTDIR)$(pkglibdir)/$$f; \
+	done
+
 # Similar to install-noinst_PROGRAMS.
 # Nb: we don't use $(INSTALL_PROGRAM) here because it doesn't work with
 # directories.  XXX: not sure whether the resulting permissions will be
@@ -68,6 +76,12 @@ install-noinst_DSYMS: build-noinst_DSYMS
 	  cp -R $$f.dSYM $(DESTDIR)$(pkglibdir); \
 	done
 
+# Similar to uninstall-noinst_PROGRAMS.
+uninstall-noinst_DSYMS:
+	for f in $(noinst_DSYMS); do \
+	  rm -f $(DESTDIR)$(pkglibdir)/$$f.dSYM; \
+	done
+
 # This needs to be depended on by a 'clean-local' rule.
 clean-noinst_DSYMS:
 	for f in $(noinst_DSYMS); do \
diff --git a/Makefile.tool.am b/Makefile.tool.am
index 563d5403c..6e15ce4e8 100644
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -187,3 +187,5 @@ clean-local: clean-noinst_DSYMS
 
 install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS
 
+uninstall-local: uninstall-noinst_PROGRAMS uninstall-noinst_DSYMS
+
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index c3ba6bb9c..c5cc61d93 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -632,6 +632,8 @@ clean-local: clean-noinst_DSYMS
 
 install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS
 
+uninstall-local: uninstall-noinst_PROGRAMS uninstall-noinst_DSYMS
+
 #----------------------------------------------------------------------------
 # Darwin linker kludges
 #----------------------------------------------------------------------------
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 7a809e77a..f5b7258f3 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -230,6 +230,7 @@ dist-hook: FAQ.txt html-docs man-pages
 
 distclean-local:
 	rm -rf html print
+	rm -f FAQ.txt
 	rm -f $(top_builddir)/FAQ.txt $(top_builddir)/docs/*.1
 
 
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index e2144a68c..c15680b67 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -69,3 +69,5 @@ clean-local: clean-noinst_DSYMS
 
 install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS
 
+uninstall-local: uninstall-noinst_PROGRAMS uninstall-noinst_DSYMS
+