LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] samples: build fix
@ 2008-02-14  3:45 Roland McGrath
  2008-02-14 13:27 ` Mathieu Desnoyers
  0 siblings, 1 reply; 9+ messages in thread
From: Roland McGrath @ 2008-02-14  3:45 UTC (permalink / raw)
  To: Linus Torvalds, Andrew Morton; +Cc: Mathieu Desnoyers, linux-kernel


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.

Signed-off-by: Roland McGrath <roland@redhat.com>
---
 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

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2008-02-14 21:06 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-14  3:45 [PATCH] samples: build fix Roland McGrath
2008-02-14 13:27 ` Mathieu Desnoyers
2008-02-14 19:26   ` Roland McGrath
2008-02-14 19:46   ` Sam Ravnborg
2008-02-14 20:02     ` Roland McGrath
2008-02-14 20:09       ` Randy Dunlap
2008-02-14 20:42       ` Sam Ravnborg
2008-02-14 20:04     ` Mathieu Desnoyers
2008-02-14 21:06       ` Sam Ravnborg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).