[LTP] [PATCH v2] avoid triggering config.mk/features.mk target in clean tree

Cyril Hrubis chrubis@suse.cz
Tue Sep 22 12:45:04 CEST 2015


Hi!
> diff --git a/include/mk/env_pre.mk b/include/mk/env_pre.mk
> index 9c757e35e455..a7674141c83c 100644
> --- a/include/mk/env_pre.mk
> +++ b/include/mk/env_pre.mk
> @@ -98,8 +98,12 @@ endif
>  # which are filtered below (e.g. clean). However these config files may be
>  # needed for those targets (eg. the open posix testsuite is not cleaned even if
>  # it's enabled by configure) thus it would be wise to do silent inclusion.
> --include $(abs_top_builddir)/include/mk/config.mk
> --include $(abs_top_builddir)/include/mk/features.mk
> +ifneq ($(wildcard $(abs_top_builddir)/include/mk/config.mk),)
> +include $(abs_top_builddir)/include/mk/config.mk
> +endif
> +ifneq ($(wildcard $(abs_top_builddir)/include/mk/features.mk),)
> +include $(abs_top_builddir)/include/mk/features.mk
> +endif
>  
>  # autotools, *clean, and help don't require config.mk, features.mk, etc...
>  ifeq ($(filter autotools %clean .gitignore gitignore.% help,$(MAKECMDGOALS)),)

Looks good to me (thanks for fixing this). Also notice that we have
nearly identical patch from Yuriy Kolerov ([LTP] [PATCH] Fix including
config.mk and features.mk in env_pre.mk) sent to the list.

-- 
Cyril Hrubis
chrubis@suse.cz


More information about the Ltp mailing list