On 07/13/14 11:42, Sam Ravnborg wrote: > Use one line per module/program in Makefile. > This style is easier to read/extend. > > Introduce inverse xmas style sorting. google search couldn't tell me what that means and I cannot deduce it from the new Makefile ordering (if there is some ordering). Please explain. Thanks. > This may prevent some merge conflicts in the future > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > --- > samples/Makefile | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/samples/Makefile b/samples/Makefile > index 1a60c62..7c08028 100644 > --- a/samples/Makefile > +++ b/samples/Makefile > @@ -1,4 +1,15 @@ > # Makefile for Linux samples code > +# Sort entries using inverse xmas style > +# > +# kernel modules > +obj-$(CONFIG_SAMPLES) += hw_breakpoint/ > +obj-$(CONFIG_SAMPLES) += trace_events/ > +obj-$(CONFIG_SAMPLES) += kprobes/ > +obj-$(CONFIG_SAMPLES) += kobject/ > +obj-$(CONFIG_SAMPLES) += kfifo/ > +obj-$(CONFIG_SAMPLES) += rpmsg/ > +obj-$(CONFIG_SAMPLES) += kdb/ > > -obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ \ > - hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ > +# user space programs > +obj-$(CONFIG_SAMPLES) += seccomp/ > +obj-$(CONFIG_SAMPLES) += hidraw/ > -- ~Randy -- 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