* Roland McGrath ([EMAIL PROTECTED]) wrote: > > The samples/ subdirectory contains only modules. > But the only make run done there is in commands for vmlinux. > I can't see why this was ever done in this nonstandard fashion. > As things stand, the modules don't get built by 'make modules'. > > I didn't make the addition of the directory use core-$(CONFIG_SAMPLES) > because there is no other conditional like that in the top-level Makefile > and samples/Makefile already uses obj-$(CONFIG_SAMPLES) as if it expects > always to be included. >
Sam, is this ok with the samples intent ? I think as long as we do not include them with the kernel image and have a "make samples" to build them, it's ok. Having them built upon make modules seems like a good idea to me. Mathieu > Signed-off-by: Roland McGrath <[EMAIL PROTECTED]> > --- > Makefile | 5 +---- > 1 files changed, 1 insertions(+), 4 deletions(-) > > diff --git a/Makefile b/Makefile > index c162370..9e9ce33 100644 > --- a/Makefile > +++ b/Makefile > @@ -602,7 +602,7 @@ export mod_strip_cmd > > > ifeq ($(KBUILD_EXTMOD),) > -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ > +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ > samples/ > > vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ > $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ > @@ -802,9 +802,6 @@ vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) > vmlinux.o $(kallsyms.o) > ifdef CONFIG_HEADERS_CHECK > $(Q)$(MAKE) -f $(srctree)/Makefile headers_check > endif > -ifdef CONFIG_SAMPLES > - $(Q)$(MAKE) $(build)=samples > -endif > $(call vmlinux-modpost) > $(call if_changed_rule,vmlinux__) > $(Q)rm -f .old_version -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
