[apparmor] [PATCH 2/9] Cleanup libapparmor_re Makefile to use patterns

[Seth Arnold]

On Mon, Sep 14, 2015 at 08:11:14PM -0700, John Johansen wrote:
> Signed-off-by: John Johansen <john.johansen at canonical.com>

There's a bug in this patch, parse.h is a dependency for aare_rules.o but
wasn't included in the HDRS variable.

Thanks

> diff --git a/parser/libapparmor_re/Makefile b/parser/libapparmor_re/Makefile
> index f66702a..c8d9db6 100644
> --- a/parser/libapparmor_re/Makefile
> +++ b/parser/libapparmor_re/Makefile
> @@ -20,19 +20,14 @@ BISON := bison
>  all : ${TARGET}
>  
>  UNITTESTS = tst_parse
> +SRCS = expr-tree.cc hfa.cc aare_rules.cc chfa.cc parse.cc
> +HDRS = expr-tree.h hfa.h aare_rules.h chfa.h apparmor_re.h flex-tables.h ../immunix.h
> +OBJS = $(SRCS:.cc=.o)
>  
> -libapparmor_re.a: parse.o expr-tree.o hfa.o chfa.o aare_rules.o
> +libapparmor_re.a: $(OBJS)
>  	ar ${ARFLAGS} $@ $^
>  
> -expr-tree.o: expr-tree.cc expr-tree.h apparmor_re.h
> -
> -hfa.o: hfa.cc hfa.h apparmor_re.h expr-tree.h ../immunix.h
> -
> -aare_rules.o: aare_rules.cc aare_rules.h apparmor_re.h expr-tree.h hfa.h chfa.h parse.h ../immunix.h
> -
> -chfa.o: chfa.cc chfa.h hfa.h apparmor_re.h expr-tree.h flex-tables.h ../immunix.h
> -
> -parse.o : parse.cc apparmor_re.h expr-tree.h
> +%.o: %.cc $(HDRS)
>  
>  parse.cc : parse.y parse.h flex-tables.h ../immunix.h
>  	${BISON} -o $@ $<
-------------- 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/20150915/c1f8a470/attachment.pgp>