Hello, Am Freitag, 23. Januar 2015 schrieb Steve Beattie: > On Fri, Jan 23, 2015 at 10:30:44AM -0800, Steve Beattie wrote: > > On Fri, Jan 16, 2015 at 06:23:29PM +0100, Christian Boltz wrote: > > Since we've gone with the single tarball approach to releases, a low > > priority task has been to remove a bunch of the cruft in Make.rules > > that's no longer relevant. > > And here's a followup patch to remove a bunch of the rpm cruft from > common/Make.rules.
I hope you found all dependencies that are superfluous - too bad that we don't have coverage checks for the Makefile to find dead code ;-) > Signed-off-by: Steve Beattie <[email protected]> > --- > Makefile | 5 +-- > common/Make.rules | 89 > +----------------------------------------------------- 2 files > changed, 4 insertions(+), 90 deletions(-) > > 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. > Index: b/common/Make.rules > =================================================================== > --- a/common/Make.rules > +++ b/common/Make.rules ... > ifndef DISTRO > DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \ > echo slackware ; \ parser/Makefile is the only remaining user of DISTRO, so maybe we should move it there in a follow-up patch. > REPO_VERSION_CMD=([ -x /usr/bin/bzr ] && /usr/bin/bzr version-info . > 2> /dev/null || awk '{ print "revno: "$2 }' common/.stamp_rev) | awk > '/^revno:/ { print $2 }' 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 ;-) > .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. Additionally, the way it was defined before makes it very unlikely that it worked on Ubuntu and debian, which is a good argument for saying that it can probably be removed (together with its .PHONY and .SILENT rules). With or without "version:" removed, Acked-by: Christian Boltz <[email protected]> Regards, Christian Boltz -- >PHP5 wäre auch mal interessant... *WAAAAAAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH* [> Ratti und David Haller in fontlinge-devel] -- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
