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

[Christian Boltz]

Hello,

Am Dienstag, 15. September 2015 schrieb John Johansen:
> On 09/14/2015 08:11 PM, John Johansen wrote:
> > 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.
> 
> I missed cleaning up the VAR definition with this it needs this
> additional bit
> 
> diff --git a/parser/Makefile b/parser/Makefile
> index 2976dab..efb8668 100644
> --- a/parser/Makefile
> +++ b/parser/Makefile
> @@ -86,23 +86,12 @@ EXTRA_CXXFLAGS+=-DPACKAGE=\"${NAME}\"
> -DLOCALEDIR=\"${LOCALEDIR}\" # Compile-time configuration of the
> location of the config file
> EXTRA_CXXFLAGS+=-DSUBDOMAIN_CONFDIR=\"${CONFDIR}\"
> 
> -C_OBJS_HDRS = parser_include.o parser_merge.o parser_symtab.o \
> -             parser_variable.o parser_alias.o parser_common.o
> policy_cache.o \ -             lib.o
> -C_OBJS_YACC = parser_lex.o parser_policy.o
> -C_OBJS_AA = parser_yacc.o
> -C_OBJS_RE = parser_interface.o common_optarg.o
> -C_OBJS_AA_RE = parser_regex.o
> -C_OBJS_YACC_AF = network.o
> -C_OBJS_AA_CAP = parser_misc.o
> -C_OBJS_AA_RE_VER = parser_main.o
> -
> -CXX_OBJS_HDRS = mount.o profile.o rule.o
> -CXX_OBJS_AA = dbus.o signal.o ptrace.o af_rule.o af_unix.o
> -
> -C_OBJS = $(C_OBJS_HDRS) $(C_OBJS_YACC) $(C_OBJS_AA) $(C_OBJS_RE) \
> -         $(C_OBJS_AA_RE) $(C_OBJS_YACC_AF) $(C_OBJS_AA_CAP)
> $(C_OBJS_AA_RE_VER) -CXX_OBJS = $(CXX_OBJS_HDRS) $(CXX_OBJS_AA)
> +C_OBJS = parser_main.o parser_yacc.o parser_lex.o lib.o
> parser_alias.o \ +         parser_common.o parser_include.o
> parser_interface.o parser_merge.o \ +         parser_misc.o
> parser_policy.o parser_regex.o parser_symtab.o \ +        
> parser_variable.o policy_cache.o common_optarg.o network.o +
> +CXX_OBJS = mount.o profile.o rule.o dbus.o signal.o ptrace.o
> af_rule.o af_unix.o

Acked-by: Christian Boltz <apparmor at cboltz.de>


Regards,

Christian Boltz
-- 
> folgender Spam ist hier eingetroffen. Bitte ergreifen Sie
> gegen Ihren Kunden geeignete Maßnahmen.            _____
Wir haben den User erschossen.                    ___|[] |
                       abuse at germany.net       \__|______|
                       Wir machen den Weg frei /-(o_o_o_o)