From a157966205197d86ac1c967857800601ab46330f Mon Sep 17 00:00:00 2001
From: Steve Beattie <sbeattie@ubuntu.com>
Date: Mon, 26 Jan 2015 15:39:10 -0800
Subject: [PATCH] libapparmor: more Makefile cleanups

Get rid of the relics in libapparmor's Makefile.am for generating
tarballs from svn, which is no longer relevant. Also clean generated
manpages during make clean rather than just make maintainer-clean.
---
 libraries/libapparmor/Makefile.am     | 18 ------------------
 libraries/libapparmor/doc/Makefile.am |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/libraries/libapparmor/Makefile.am b/libraries/libapparmor/Makefile.am
index b22a13e6d..4ad8bdc69 100644
--- a/libraries/libapparmor/Makefile.am
+++ b/libraries/libapparmor/Makefile.am
@@ -4,22 +4,4 @@ SRCDIR = src
 
 SUBDIRS = doc src include swig testsuite
 
-REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \
-	/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
-	fi)
-
-REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \
-	/usr/bin/svn info . 2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \
-	fi)
-RELEASE_DIR     = $(NAME)-$(VERSION)-${REPO_VERSION}
-
-SVNTARBALL = $(NAME)-$(VERSION)-${REPO_VERSION}.tar.gz
-SVNTAR = /bin/tar czvp -h --exclude .svn --exclude CVS --exclude .cvsignore --exclude ${SVNTARBALL} --exclude ${RELEASE_DIR}/${RELEASE_DIR}  $(shell test -f ${NAME}.exclude && echo "-X ${NAME}.exclude")
-
-distball: clean
-	rm -rf $(RELEASE_DIR)
-	svn export -r $(REPO_VERSION) $(REPO_URL) $(RELEASE_DIR)
-	$(SVNTAR) -f $(SVNTARBALL) $(RELEASE_DIR)
-	rm -rf $(RELEASE_DIR)
-	
 EXTRA_DIST = AUTHORS ChangeLog COPYING.LGPL INSTALL NEWS README
diff --git a/libraries/libapparmor/doc/Makefile.am b/libraries/libapparmor/doc/Makefile.am
index 4591a7184..39d741d66 100644
--- a/libraries/libapparmor/doc/Makefile.am
+++ b/libraries/libapparmor/doc/Makefile.am
@@ -11,8 +11,8 @@ PODS = $(subst .2,.pod,$(man_MANS))
 
 EXTRA_DIST = $(man_MANS) $(PODS)
 
-## delete man pages at maintainer-clean
-BUILT_SOURCES = $(man_MANS)
+## delete man pages at make clean
+CLEANFILES = $(man_MANS)
 
 %.2: %.pod
 	$(PODCHECKER) -warnings -warnings $<