[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-arch
Subject:    Re: + disable-init-initramfsc-updated.patch added to -mm tree
From:       Matthew Wilcox <matthew () wil ! cx>
Date:       2006-12-14 21:45:26
Message-ID: 20061214214526.GU21070 () parisc-linux ! org
[Download RAW message or body]

On Thu, Dec 14, 2006 at 01:39:33PM -0800, akpm@osdl.org wrote:
> diff -puN init/Makefile~disable-init-initramfsc-updated init/Makefile
> --- a/init/Makefile~disable-init-initramfsc-updated
> +++ a/init/Makefile
> @@ -2,7 +2,12 @@
>  # Makefile for the linux kernel.
>  #
>  
> -obj-y				:= main.o version.o mounts.o initramfs.o
> +obj-y                          := main.o version.o mounts.o
> +ifneq ($(CONFIG_BLK_DEV_INITRD),y)
> +obj-y                          += noinitramfs.o
> +else
> +obj-$(CONFIG_BLK_DEV_INITRD)   += initramfs.o
> +endif
>  obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o
>  
>  mounts-y			:= do_mounts.o

I thought we tried to avoid if/else/endif constructs in Makefiles these
days, opting for a more declarative:

init-y				:= noinitramfs.o
init-$(CONFIG_BLK_DEV_INITRD)	:= initramfs.o
obj-y				:= main.o version.o mounts.o $(init-y)

-
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]