Commit 65b809d0 authored by Kai Germaschewski's avatar Kai Germaschewski

kbuild: Revert automatically building modules

People are confused by "make vmlinux/bzImage/..." building modules at
the same time. So revert to the old behavior.

"make bzImage modules" builds bzImage and modules, using only one pass
of descending into subdirs.

"make" or "make all" builds a standard target of "vmlinux modules". On
i386 this is extended to do "bzImage modules", which seems to be the most
sensible default.
parent 2e8556ce
...@@ -48,11 +48,35 @@ ifndef KBUILD_VERBOSE ...@@ -48,11 +48,35 @@ ifndef KBUILD_VERBOSE
KBUILD_VERBOSE = 1 KBUILD_VERBOSE = 1
endif endif
# Decide whether to build built-in, modular, or both # Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
KBUILD_MODULES := 1 KBUILD_MODULES :=
KBUILD_BUILTIN := 1 KBUILD_BUILTIN := 1
# If we have only "make modules", don't compile built-in objects.
ifeq ($(MAKECMDGOALS),modules)
KBUILD_BUILTIN :=
endif
# If we have "make <whatever> modules", compile modules
# in addition to whatever we do anyway.
ifneq ($(filter modules,$(MAKECMDGOALS)),)
KBUILD_MODULES := 1
endif
# Just "make" or "make all" shall build modules as well
ifeq ($(MAKECMDGOALS),)
KBUILD_MODULES := 1
endif
ifneq ($(filter all,$(MAKECMDGOALS)),)
KBUILD_MODULES := 1
endif
export KBUILD_MODULES KBUILD_BUILTIN export KBUILD_MODULES KBUILD_BUILTIN
# Beautify output # Beautify output
...@@ -120,6 +144,8 @@ export CPPFLAGS EXPORT_FLAGS NOSTDINC_FLAGS ...@@ -120,6 +144,8 @@ export CPPFLAGS EXPORT_FLAGS NOSTDINC_FLAGS
export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
SUBDIRS := init kernel mm fs ipc lib drivers sound net
noconfig_targets := xconfig menuconfig config oldconfig randconfig \ noconfig_targets := xconfig menuconfig config oldconfig randconfig \
defconfig allyesconfig allnoconfig allmodconfig \ defconfig allyesconfig allnoconfig allmodconfig \
clean mrproper distclean \ clean mrproper distclean \
...@@ -182,7 +208,7 @@ endif ...@@ -182,7 +208,7 @@ endif
# Link components for vmlinux # Link components for vmlinux
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
SUBDIRS := init kernel mm fs ipc lib drivers sound net
INIT := init/init.o INIT := init/init.o
CORE_FILES := kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o CORE_FILES := kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
LIBS := lib/lib.a LIBS := lib/lib.a
...@@ -254,6 +280,7 @@ $(SUBDIRS): .hdepend prepare ...@@ -254,6 +280,7 @@ $(SUBDIRS): .hdepend prepare
.PHONY: prepare .PHONY: prepare
prepare: include/linux/version.h include/asm include/config/MARKER prepare: include/linux/version.h include/asm include/config/MARKER
@echo ' Starting the build. KBUILD_BUILTIN=$(KBUILD_BUILTIN) KBUILD_MODULES=$(KBUILD_MODULES)'
# Single targets # Single targets
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -384,8 +411,7 @@ MODFLAGS += -include $(HPATH)/linux/modversions.h ...@@ -384,8 +411,7 @@ MODFLAGS += -include $(HPATH)/linux/modversions.h
endif endif
.PHONY: modules .PHONY: modules
modules: modules: $(SUBDIRS)
@$(MAKE) KBUILD_BUILTIN= $(SUBDIRS)
# Install modules # Install modules
......
...@@ -110,6 +110,8 @@ vmlinux: arch/i386/vmlinux.lds ...@@ -110,6 +110,8 @@ vmlinux: arch/i386/vmlinux.lds
.PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \ .PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \
clean archclean archmrproper clean archclean archmrproper
all: bzImage
zImage: vmlinux zImage: vmlinux
@$(MAKEBOOT) zImage @$(MAKEBOOT) zImage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment