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

Christian Boltz apparmor at cboltz.de
Wed Jan 28 21:13:53 UTC 2015


Hello,

Am Dienstag, 27. Januar 2015 schrieb Steve Beattie:
> On Sat, Jan 24, 2015 at 03:22:59PM +0100, Christian Boltz wrote:
> > > 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.
> > 
> > How many shades of clean do our Makefiles contain?
> > 
> > I was aware of "clean" and "distclean", but "maintainer-clean" is
> > new
> > for me.
> 
> Our hand-written makefiles contain only 'clean'. The automake
> generated makefiles have mostlyclean, clean, distclean, and
> maintainer-clean:
> http://www.gnu.org/software/automake/manual/html_node/Clean.html .
> Gotta love needing to remember the subtle differences between four
> different clean targets (and inconsistently named, to make everything
> more awesome, too).

Maybe we should just call the "right" clean (whatever that is) from the 
global Makefile...



parser/Makefile also has a dist_clean:

clean: _clean
# ...
    rm -f $(LEX_C_FILES)
    rm -f $(YACC_C_FILES)
# ...
    $(MAKE) -s -C $(AAREDIR) clean
    $(MAKE) -s -C po clean
    $(MAKE) -s -C tst clean

.SILENT: dist_clean
dist_clean:
    @$(MAKE) clean
    @rm -f $(LEX_C_FILES) $(YACC_C_FILES)


Note that "dist_clean" deletes files that are already deleted by 
"clean", which means "dist_clean" is basically superfluous ;-)

Assuming that nobody uses dist_clean, the obvious patch is:

[ parser_Makefile_drop_dist_clean.diff ]

=== modified file 'parser/Makefile'
--- parser/Makefile     2015-01-23 23:52:09 +0000
+++ parser/Makefile     2015-01-28 21:11:51 +0000
@@ -370,7 +370,3 @@
        $(MAKE) -s -C po clean
        $(MAKE) -s -C tst clean
 
-.SILENT: dist_clean
-dist_clean:
-       @$(MAKE) clean
-       @rm -f $(LEX_C_FILES) $(YACC_C_FILES)



Regards,

Christian Boltz
-- 
Und dann kommt man sich auch noch ziemlich dämlich vor, seine alte
ATA-5-Platte mit einem Board zu verbinden, auf dem 4 S-ATA-Anschlüsse
drauf sind. Formel-1 in der Garage. :-)   [Ratti in suse-linux]




More information about the AppArmor mailing list