[apparmor] [PATCH 8/9] Makefile: collapse different dependency classes

[John Johansen]

There is no reason to keep the different dependency classes, just
make the object files depend on all headers which will help force
recompiles if any of the source files changes its list of includes.

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

diff --git a/parser/Makefile b/parser/Makefile
index d3fc23d..2976dab 100644
--- a/parser/Makefile
+++ b/parser/Makefile
@@ -110,6 +110,7 @@ OBJECTS = $(C_OBJS) $(CXX_OBJS)
 HDRS = parser.h parser_include.h immunix.h mount.h dbus.h lib.h profile.h \
        rule.h common_optarg.h signal.h ptrace.h network.h af_rule.h af_unix.h \
        policy_cache.h
+GENERATED_HDRS = parser_yacc.h parser_version.h af_names.h cap_names.h
 TOOLS = apparmor_parser
 
 
@@ -225,38 +226,12 @@ parser_lex.c: parser_lex.l parser_yacc.h $(HDRS)
 	$(LEX) ${LEXFLAGS} -o$@ $<
 
 
-$(C_OBJS_HDRS): %.o: %.c $(HDRS)
+$(C_OBJS): %.o: %.c $(HDRS) $(AARE_HDRS) $(APPARMOR_H) $(GENERATED_HDRS)
 	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
 
-$(C_OBJS_YACC): %.o: %.c parser_yacc.h $(HDRS)
+$(CXX_OBJS): %.o: %.cc $(HDRS) $(AARE_HDRS) $(APPARMOR_H) $(GENERATED_HDRS)
 	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
 
-$(C_OBJS_AA): %.o: %.c $(HDRS) $(APPARMOR_H)
-	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
-
-$(C_OBJS_RE): %.o: %.c $(HDRS) $(AARE_HDRS)
-	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
-
-$(C_OBJS_AA_RE): %.o: %.c $(HDRS) $(AARE_HDRS) $(APPARMOR_H)
-	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
-
-$(C_OBJS_YACC_AF): %.o: %.c parser_yacc.h af_names.h $(HDRS)
-	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
-
-$(C_OBJS_AA_CAP): %.o: %.c $(HDRS) cap_names.h $(APPARMOR_H)
-	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
-
-$(C_OBJS_AA_RE_VER): %.o: %.c $(HDRS) $(AARE_HDRS) $(APPARMOR_H) parser_version.h
-	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
-
-
-$(CXX_OBJS_HDRS): %.o: %.cc $(HDRS)
-	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
-
-$(CXX_OBJS_AA): %.o: %.cc $(HDRS) $(APPARMOR_H)
-	$(CXX) $(EXTRA_CXXFLAGS) -c -o $@ $<
-
-
 
 parser_version.h: Makefile
 	@echo \#define PARSER_VERSION \"$(VERSION)\" > .ver
-- 
2.1.4