Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S131480AbRDFLgE>; Fri, 6 Apr 2001 07:36:04 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S131481AbRDFLfy>; Fri, 6 Apr 2001 07:35:54 -0400
Received: from frege-d-math-north-g-west.math.ethz.ch ([129.132.145.3]:65463
	"EHLO frege.math.ethz.ch") by vger.kernel.org with ESMTP
	id <S131480AbRDFLfp>; Fri, 6 Apr 2001 07:35:45 -0400
Message-ID: <3ACDA9CB.583241B6@math.ethz.ch>
Date: Fri, 06 Apr 2001 13:34:35 +0200
From: Giacomo Catenazzi <cate@math.ethz.ch>
Reply-To: cate@debian.org
X-Mailer: Mozilla 4.7C-SGI [en] (X11; I; IRIX 6.5 IP22)
X-Accept-Language: en
MIME-Version: 1.0
To: Johan Adolfsson <johan.adolfsson@axis.com>
CC: linux-kernel@vger.kernel.org
Subject: Re: Arch specific/multiple Configure.help files? [PATCH included]
In-Reply-To: <fa.ggqkpgv.9g0c0b@ifi.uio.no> <fa.k6fq96v.nhaq06@ifi.uio.no> <3ACD68FF.637D8958@math.ethz.ch> <018001c0be69$90dcb200$9db270d5@homeip.net> <3ACD73E0.2B1DFF6F@math.ethz.ch> <19da01c0be78$f9106c90$0a070d0a@axis.se> <3ACD8ECC.F2518B90@math.ethz.c
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

Johan Adolfsson wrote:
> 
> > This change is too big for 2.4 kernel.
> 
> It doesnt look that big to mee, so here it is for everyones consideration
> (the mailprogram probably screws up tabs etc. but you get the idea,
> I apologise if posting patches like this is the wrong way)
> 
> The normal user/developer shouldn't even notice the difference,
> the patch shouldn't break anything, just make it possible to
> use multiple help files.
> 
> linux/Makefile: (linenumber probably a bit off)
> @@ -40,6 +44,10 @@ MODFLAGS = -DMODULE
>  CFLAGS_KERNEL =
>  PERL = perl
> 
> +# Helpfiles used in the config system
> +# (merged to Documentation/Configure.help.generated)
> +HELPFILES       = arch/$(ARCH)/Configure.help Documentation/Configure.help
> +
>  export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
>   CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
>   CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS MODFLAGS PERL
> @@ -260,19 +270,22 @@ symlinks:
>   @if [ ! -d include/linux/modules ]; then \
>   mkdir include/linux/modules; \
>   fi
> +
> +helpfiles:
> + -cat $(HELPFILES) >Documentation/Configure.help.generated 2>/dev/null
> 
> -oldconfig: symlinks
> +oldconfig: symlinks helpfiles

No!
Documentation/Configure.help.generated: $(HELPFILES)
	-cat $(HELPFILES) >Documentation/Configure.help.generated
2>/dev/null

oldconfig: symlinks Documentation/Configure.help.generated
...

Really you should include the ARCH/COnfigure.help in
$(HELPFILES) only
if it exists (else make will complain)

>   $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
> 
> -xconfig: symlinks
> +xconfig: symlinks helpfiles
>   $(MAKE) -C scripts kconfig.tk
>   wish -f scripts/kconfig.tk
> 
> -menuconfig: include/linux/version.h symlinks
> +menuconfig: include/linux/version.h symlinks helpfiles
>   $(MAKE) -C scripts/lxdialog all
>   $(CONFIG_SHELL) scripts/Menuconfig arch/$(ARCH)/config.in
> 
> -config: symlinks
> +config: symlinks helpfiles
>   $(CONFIG_SHELL) scripts/Configure arch/$(ARCH)/config.in
> 

ditto.

>  include/config/MARKER: scripts/split-include include/linux/autoconf.h
> 
> RCS file: /n/cvsroot/os/linux/scripts/Configure,v
> retrieving revision 1.1.1.2
> diff -u -p -r1.1.1.2 Configure
> --- scripts/Configure 2001/01/10 13:28:58 1.1.1.2
> +++ scripts/Configure 2001/04/06 09:57:44

OK!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/