[apparmor] [patch] more Make.rules cruft removal

[Steve Beattie]

On Fri, Jan 23, 2015 at 09:53:43PM +0100, Christian Boltz wrote:
> > Index: b/Makefile
> > ===================================================================
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1,8 +1,7 @@
> >  #
> >  #
> > -OVERRIDE_TARBALL=yes
> > -
> > -include common/Make.rules
> > +COMMONDIR=common
> > +include ${COMMONDIR}/Make.rules
> > 
> >  DIRS=parser \
> >       profiles \
> 
> See previous mail - this should be commited as part of the "cleanup the 
> 'common' mess" patch.

I moved the COMMONDIR definition to the previous patch, but the
OVERRIDE_TARBALL bit needed to go with the rest of this patch.

> parser/Makefile is the only remaining user of DISTRO, so maybe we should 
> move it there in a follow-up patch.

I kind of want it to go away; it's only use is to determine which
initscript to install, which Debian and Ubuntu don't use.

> >  .PHONY: version
> >  .SILENT: version
> >  version:
> > -	 rpm -q --define "_sourcedir ." ${RPMARG} --specfile ${SPECFILE}
> > +	echo $(VERSION)
> 
> Is the "version" target used somewhere? grep didn't bring up anything 
> even in the current Makefiles, however "version" is a too common term so 
> that I might have overlooked something.

No, it's not used by any other target. It exists for debugging,
to ensure that VERSION is set properly at any given point (i.e. I
can do 'make version' and see a result that I expect). Given that
as you pointed out, the prior implementation wouldn't have worked on
debian/ubuntu (and wouldn't work anywhere without a specfile to query),
it's not crucial to keep. The 'make repo_version' target exists for
the same reason.

> grep -r REPO_VERSION brings up some interesting results in 
> libappparmor/Makefile.am - read and laugh yourself about what you'll 
> find there, and then please send another cleanup patch ;-)

Ohhhh, it needs to die with fire, it does. Patch follows, that also
converts the libapparmor/doc/ clean to get rid of the manpages on make
clean, not make maintainer-clean.

Thanks.

Signed-off-by: Steve Beattie <steve at nxnw.org>
---
 libraries/libapparmor/Makefile.am     |   18 ------------------
 libraries/libapparmor/doc/Makefile.am |    4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)

Index: b/libraries/libapparmor/Makefile.am
===================================================================
--- 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
Index: b/libraries/libapparmor/doc/Makefile.am
===================================================================
--- 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 $<

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20150123/052a7308/attachment.pgp>