From patchwork Mon Mar 19 11:26:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 132030 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2606654ljb; Mon, 19 Mar 2018 04:27:19 -0700 (PDT) X-Google-Smtp-Source: AG47ELuWOLp4ewq7lJMRnUzLGpkv0RzcZp0BLN+qV1vEbBDwEzq3QMnz9mZ92A15E5dKHD+j9qUj X-Received: by 10.101.86.70 with SMTP id m6mr9071773pgs.349.1521458838987; Mon, 19 Mar 2018 04:27:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521458838; cv=none; d=google.com; s=arc-20160816; b=z8LwuDL7asVdazYGEN+uo0qI3JXL2n5FKSWEvT1EOTP0XhTmWhZjGrTiGCSh2qFwgs i3cRoJRCC1nRjw0k1HakD21y5D2SXeXJUVbj1v4yGy499ege1mgqjZNK9zyIr4xSAo7P WXHyrLAXfXj/C0l8s3+7H9gSHCu6bDTH4c6yamur5FphuAkjMdHm/6TtLMtTn7J5sjRo ytTvEyB8iLAhmMWdPjqn6jgHh9KdxXepvkxhWD+jRm/Eq12BxpcH+hWvnrl7o7c0T0tm neK/aHD3Z1oU5S4sFrmmzg5Lqe/7Oj5VEkVRoL9dD8FwLg2i5AgxBMzUD75wKItaTNHh bJEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=06vDShcrACkzJtOVE8zghhP/LdwYoXm4E9qdls0K/wg=; b=XGEysb4v6jMYe8hZUWFph3jBpO3Hf+Xt+ksdG68P046IhPW2GnUX+hex05W372PiSs Gf6GgPXpteplCg3u6+gchCLtOiBhASj2mjeugUSJDvYYtnMpGDrXnGN2v+RRA17LoSp+ InPF+bZPBiUoxlV/K0zy3HGcBTh6skpxW60mGXOPNgjdbvG5GitlrxJn4r4U4KXmdAxc Ci96q5sHzVHEHX5DiCWKML4fZznHk3FmJFiLGaubMwQu/Nc7IHTnyoJTo5Yx3qgsWQiI 6p/vCZjuggqrvnQIK8ceRnk+DmKADC9pi4TeauLs7TXyM1ulcS6JUanpOqxqRiTLWCUQ 9WqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=CFAx4J7w; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si12228580plj.510.2018.03.19.04.27.18; Mon, 19 Mar 2018 04:27:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=CFAx4J7w; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932915AbeCSL1P (ORCPT + 28 others); Mon, 19 Mar 2018 07:27:15 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30060 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755299AbeCSL1M (ORCPT ); Mon, 19 Mar 2018 07:27:12 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w2JBQHQr023258; Mon, 19 Mar 2018 20:26:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w2JBQHQr023258 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1521458780; bh=06vDShcrACkzJtOVE8zghhP/LdwYoXm4E9qdls0K/wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CFAx4J7woNIpGAFZKH9H4iT8bL2eRPYZKMeqDkuz/mSeO+EH3YyamKEGviQJG6IHX uYF22wklty2gf96NgnSgMmNIW8yayuykvMnQD0SdU1LvtPnJ70e1FjKqA2dE1u+CJt MOFekKI6ivuSU7GUqXj1DvRSdLqGNjue97nEqvIjoZc3BY82Z1FfvTwKvfv82J5i7l K9l1yxejGxLKMuG8/cwOSrbKfh/9xMHhGN4ICM/1ePY5TvFphAKoeSf7hSytsVQQOS fEp4NSWMKcZVLpAQYX2CXyPs37bE/DlEzv0pHXrxW9wEkeYhDoAEz4rSIZd7+N93VT CcMhVmU1/wQ9Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , linux-kernel@vger.kernel.org, Nicholas Piggin , Masahiro Yamada Subject: [PATCH 3/7] lib: zstd: clean up Makefile for simpler composite object handling Date: Mon, 19 Mar 2018 20:26:09 +0900 Message-Id: <1521458773-14224-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> References: <1521458773-14224-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(-) -- 2.7.4 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 -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