|
From: <sv...@va...> - 2014-05-09 14:25:46
|
Author: mjw
Date: Fri May 9 14:25:39 2014
New Revision: 13950
Log:
Add uninstall-local rules to make distcheck happy.
Also remove generated FAQ.txt in docs distclean-local rule.
Modified:
trunk/Makefile.all.am
trunk/Makefile.tool.am
trunk/coregrind/Makefile.am
trunk/docs/Makefile.am
trunk/mpi/Makefile.am
Modified: trunk/Makefile.all.am
==============================================================================
--- trunk/Makefile.all.am (original)
+++ trunk/Makefile.all.am Fri May 9 14:25:39 2014
@@ -58,6 +58,14 @@
$(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 @@
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 \
Modified: trunk/Makefile.tool.am
==============================================================================
--- trunk/Makefile.tool.am (original)
+++ trunk/Makefile.tool.am Fri May 9 14:25:39 2014
@@ -187,3 +187,5 @@
install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS
+uninstall-local: uninstall-noinst_PROGRAMS uninstall-noinst_DSYMS
+
Modified: trunk/coregrind/Makefile.am
==============================================================================
--- trunk/coregrind/Makefile.am (original)
+++ trunk/coregrind/Makefile.am Fri May 9 14:25:39 2014
@@ -632,6 +632,8 @@
install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS
+uninstall-local: uninstall-noinst_PROGRAMS uninstall-noinst_DSYMS
+
#----------------------------------------------------------------------------
# Darwin linker kludges
#----------------------------------------------------------------------------
Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am (original)
+++ trunk/docs/Makefile.am Fri May 9 14:25:39 2014
@@ -230,6 +230,7 @@
distclean-local:
rm -rf html print
+ rm -f FAQ.txt
rm -f $(top_builddir)/FAQ.txt $(top_builddir)/docs/*.1
Modified: trunk/mpi/Makefile.am
==============================================================================
--- trunk/mpi/Makefile.am (original)
+++ trunk/mpi/Makefile.am Fri May 9 14:25:39 2014
@@ -69,3 +69,5 @@
install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS
+uninstall-local: uninstall-noinst_PROGRAMS uninstall-noinst_DSYMS
+
|