Re: [PATCH 3/7] lib: zstd: clean up Makefile for simpler composite object handling

From: Masahiro Yamada
Date: Mon Mar 19 2018 - 07:33:35 EST


2018-03-19 20:26 GMT+09:00 Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>:
> Now, Kbuild nicely handles composite objects to avoid multiple
> definition.
>
> Makefiles can simply add the same objects multiple times across
> composite objects.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
> ---
>
> The is clean-up from build system point of view.
>
> I will apply this for the Kbuild tree.
>
>
> lib/zstd/Makefile | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/lib/zstd/Makefile b/lib/zstd/Makefile
> index dd0a359..a1a64cf 100644
> --- a/lib/zstd/Makefile
> +++ b/lib/zstd/Makefile
> @@ -4,15 +4,7 @@ obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd_decompress.o
> ccflags-y += -O3
>
> # Object files unique to zstd_compress and zstd_decompress

This comment line should be removed as well.



> -zstd_compress-y := fse_compress.o huf_compress.o compress.o
> -zstd_decompress-y := huf_decompress.o decompress.o
> -
> -# These object files are shared between the modules.
> -# Always add them to zstd_compress.
> -# Unless both zstd_compress and zstd_decompress are built in
> -# then also add them to zstd_decompress.
> -zstd_compress-y += entropy_common.o fse_decompress.o zstd_common.o
> -
> -ifneq ($(CONFIG_ZSTD_COMPRESS)$(CONFIG_ZSTD_DECOMPRESS),yy)
> - zstd_decompress-y += entropy_common.o fse_decompress.o zstd_common.o
> -endif
> +zstd_compress-y := fse_compress.o huf_compress.o compress.o \
> + entropy_common.o fse_decompress.o zstd_common.o
> +zstd_decompress-y := huf_decompress.o decompress.o \
> + entropy_common.o fse_decompress.o zstd_common.o
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html



--
Best Regards
Masahiro Yamada