Re: [PATCH 1/3] kbuild: Make targets names tree-wide unique on x86

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Sep 14, 2014 at 6:18 AM, Kirill Tkhai <tkhai@xxxxxxxxx> wrote:
> diff --git a/init/Makefile b/init/Makefile
> index 7bc47ee..566a9ff 100644
> --- a/init/Makefile
> +++ b/init/Makefile
> @@ -2,23 +2,28 @@
>  # Makefile for the linux kernel.
>  #
>
> -obj-y                          := main.o version.o mounts.o
> +obj-y                          := main.o version.o do_mounts.o
> +
>  ifneq ($(CONFIG_BLK_DEV_INITRD),y)
>  obj-y                          += noinitramfs.o
>  else
> -obj-$(CONFIG_BLK_DEV_INITRD)   += initramfs.o
> +obj-y                          += initramfs.o do_mounts_initrd.o
> +endif
> +
> +ifeq ($(CONFIG_BLK_DEV_RAM),y)
> +obj-y                          += do_mounts_rd.o
>  endif
> +
> +ifeq ($(CONFIG_BLK_DEV_MD),y)
> +obj-y                          += do_mounts_md.o
> +endif
> +
>  obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o
>
>  ifneq ($(CONFIG_ARCH_INIT_TASK),y)
>  obj-y                          += init_task.o
>  endif
>
> -mounts-y                       := do_mounts.o
> -mounts-$(CONFIG_BLK_DEV_RAM)   += do_mounts_rd.o
> -mounts-$(CONFIG_BLK_DEV_INITRD)        += do_mounts_initrd.o
> -mounts-$(CONFIG_BLK_DEV_MD)    += do_mounts_md.o
> -

Can't you keep the obj-$(CONFIG_*) syntax?
e.g.
obj-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o
--
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




[Index of Archives]     [Linux&nblp;USB Development]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite Secrets]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux