[apparmor] [PATCH 6/9] Makdefile: group libapparmor_re header file dependencies

[John Johansen]

collect libapparmor_re header file depedencies into a single variable,
and add a missing dependency on expr-tree.h that aare_rules.h currently
has

Signed-off-by: John Johansen <john.johansen at canonical.com>
---
 parser/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/parser/Makefile b/parser/Makefile
index 0024b17..9e9e132 100644
--- a/parser/Makefile
+++ b/parser/Makefile
@@ -102,6 +102,7 @@ OBJECTS = $(patsubst %.cc, %.o, $(SRCS:.c=.o))
 AAREDIR= libapparmor_re
 AAREOBJECT = ${AAREDIR}/libapparmor_re.a
 AAREOBJECTS = $(AAREOBJECT)
+AARE_HDRS= $(AAREDIR)/apparmor_re.h $(AAREDIR)/aare_rules.h $(AAREDIR)/expr-tree.h
 AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L.
 AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
 
@@ -218,10 +219,10 @@ parser_misc.o: parser_misc.c $(HDRS) $(APPARMOR_H)
 parser_yacc.o: parser_yacc.c parser_yacc.h $(HDRS) $(APPARMOR_H)
 	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
 
-parser_main.o: parser_main.c $(HDRS) libapparmor_re/apparmor_re.h $(APPARMOR_H)
+parser_main.o: parser_main.c $(HDRS) $(AARE_HDRS) $(APPARMOR_H)
 	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
 
-parser_interface.o: parser_interface.c $(HDRS) libapparmor_re/apparmor_re.h
+parser_interface.o: parser_interface.c $(HDRS) $(AARE_HDRS)
 	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
 
 parser_include.o: parser_include.c $(HDRS)
@@ -230,7 +231,7 @@ parser_include.o: parser_include.c $(HDRS)
 parser_merge.o: parser_merge.c $(HDRS)
 	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
 
-parser_regex.o: parser_regex.c $(HDRS) libapparmor_re/apparmor_re.h libapparmor_re/aare_rules.h $(APPARMOR_H)
+parser_regex.o: parser_regex.c $(HDRS) $(AARE_HDRS) $(APPARMOR_H)
 	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
 
 parser_symtab.o: parser_symtab.c $(HDRS)
@@ -251,7 +252,7 @@ parser_common.o: parser_common.c $(HDRS)
 mount.o: mount.cc $(HDRS)
 	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
 
-common_optarg.o: common_optarg.c $(HDRS) libapparmor_re/apparmor_re.h
+common_optarg.o: common_optarg.c $(HDRS) $(AARE_HDRS)
 	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
 
 policy_cache.o: policy_cache.c $(HDRS)
-- 
2.1.4