From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753728AbbKGObR (ORCPT ); Sat, 7 Nov 2015 09:31:17 -0500 Received: from mail-qg0-f48.google.com ([209.85.192.48]:34010 "EHLO mail-qg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753547AbbKGOau (ORCPT ); Sat, 7 Nov 2015 09:30:50 -0500 From: Sandy Harris To: "Theodore Ts\\'o" , Jason Cooper , "H. Peter Anvin" , John Denker Cc: linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH 5/7] Conditionals for CONFIG_RANDOM_INIT and CONFIG_RANDOM_GCM Date: Sat, 7 Nov 2015 09:30:40 -0500 Message-Id: <1446906642-19372-5-git-send-email-sandyinchina@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1446906642-19372-1-git-send-email-sandyinchina@gmail.com> References: <1446906642-19372-1-git-send-email-sandyinchina@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Sandy Harris --- drivers/char/Makefile | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/char/Makefile b/drivers/char/Makefile index d8a7579..7d095e5 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -2,7 +2,30 @@ # Makefile for the kernel character device drivers. # -obj-y += mem.o random.o +obj-y += mem.o + +ifeq ($(CONFIG_RANDOM_GCM),y) + random_c = random_gcm.c + random_o = random_gcm.o + random_no = random.o +else + random_c = random.c + random_o = random.o + random_no = random_gcm.o +endif +obj-y += $(random_o) + +# remove the generated file after use so that +# a fresh one is built (by scripts/gen_random) +# for every compile +# remove random_no so it will not get linked +ifeq ($(CONFIG_RANDOM_INIT),y) +init-file = include/generated/random_init.h +$(random_o): $(random_c) $(init-file) + $(CC) $< -o $@ + $(Q) rm --force $(init-file) $(random_no) +endif + obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o obj-y += misc.o obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o -- 2.5.0