[apparmor] [patch] parser: fix af_xxxx.o make dependencies

Seth Arnold seth.arnold at canonical.com
Fri Sep 12 00:19:02 UTC 2014


On Thu, Sep 11, 2014 at 04:42:59PM -0700, Steve Beattie wrote:
> In trunk commit 2615, make targets for af_rule.o and af_unix.o were
> added. Unfortunately, the af_rule.o target's dependency on rule.h was
> missing the .h suffix. This patch fixes the issue and adds some other
> headers that the source file are dependent on.
> 
> Signed-off-by: Steve Beattie <steve at nxnw.org>

Acked-by: Seth Arnold <seth.arnold at canonical.com>

I thought I saw some needless compiling the other day, I suspect this will
help immensely. Thanks for tracking it down.

This does make me think we should investigate using gcc's -M family of
command line arguments to re-write the Makefile automatically or
periodically. (I can't recall if the automatic approach would slow down
our usual-case builds or not.)

Thanks

> ---
>  parser/Makefile |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: b/parser/Makefile
> ===================================================================
> --- a/parser/Makefile
> +++ b/parser/Makefile
> @@ -255,10 +255,10 @@ ptrace.o: ptrace.cc ptrace.h parser.h im
>  network.o: network.c network.h parser.h immunix.h parser_yacc.h rule.h af_names.h $(APPARMOR_H)
>  	$(CXX) $(EXTRA_CFLAGS) -c -o $@ $<
>  
> -af_rule.o: af_rule.cc af_rule.h network.h parser.h immunix.h parser_yacc.h rule
> +af_rule.o: af_rule.cc af_rule.h network.h parser.h profile.h immunix.h parser_yacc.h rule.h $(APPARMOR_H)
>  	$(CXX) $(EXTRA_CFLAGS) -c -o $@ $<
>  
> -af_unix.o: af_unix.cc af_unix.h network.h af_rule.h parser.h immunix.h parser_y
> +af_unix.o: af_unix.cc af_unix.h network.h af_rule.h parser.h profile.h immunix.h parser_y $(APPARMOR_H)
>  	$(CXX) $(EXTRA_CFLAGS) -c -o $@ $<
>  
>  profile.o: profile.cc profile.h parser.h network.h
> 
> -- 
> Steve Beattie
> <sbeattie at ubuntu.com>
> http://NxNW.org/~steve/



> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140911/0646b5a1/attachment.pgp>


More information about the AppArmor mailing list