diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-05-19 02:37:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-19 02:37:38 -0700 |
| commit | 4da35e71d7afbbae583aed8e581da9d1e70cdff1 (patch) | |
| tree | 1c2884edcc6a29504997765c311f9cf9eef00901 /Makefile | |
| parent | e6d0a0a21a842a442266dee8368039a191661d2d (diff) | |
| download | history-4da35e71d7afbbae583aed8e581da9d1e70cdff1.tar.gz | |
[PATCH] Subject: [PATCH] kbuild SUBDIRS="more/ than/ one/"
From: Andreas Gruenbacher <agruen@suse.de>
Here is a patch that re-adds support for more than one directory in SUBDIRS.
We have a number of packages that use this.
The FORCE dependency of crmodverdir seems unnecessary; removing.
(acked by Sam)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile index 33d147403b8fe..8212df80ae603 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,7 @@ $(if $(wildcard $(KBUILD_OUTPUT)),, \ $(filter-out _all,$(MAKECMDGOALS)) _all: $(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \ KBUILD_SRC=$(CURDIR) KBUILD_VERBOSE=$(KBUILD_VERBOSE) \ - KBUILD_CHECK=$(KBUILD_CHECK) KBUILD_EXTMOD=$(KBUILD_EXTMOD) \ + KBUILD_CHECK=$(KBUILD_CHECK) KBUILD_EXTMOD="$(KBUILD_EXTMOD)" \ -f $(CURDIR)/Makefile $@ # Leave processing to above invocation of make @@ -325,7 +325,7 @@ export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE # When compiling out-of-tree modules, put MODVERDIR in the module # tree rather than in the kernel tree. The kernel tree might # even be read-only. -export MODVERDIR := $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/).tmp_versions +export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_versions # The temporary file to save gcc -MD generated dependencies must not # contain a comma @@ -952,15 +952,15 @@ else # KBUILD_EXTMOD # We are always building modules KBUILD_MODULES := 1 .PHONY: crmodverdir -crmodverdir: FORCE +crmodverdir: $(Q)mkdir -p $(MODVERDIR) -.PHONY: $(KBUILD_EXTMOD) -$(KBUILD_EXTMOD): crmodverdir FORCE - $(Q)$(MAKE) $(build)=$@ +module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD)) +.PHONY: $(module-dirs) modules +$(module-dirs): crmodverdir + $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) -.PHONY: modules -modules: $(KBUILD_EXTMOD) +modules: $(module-dirs) @echo ' Building modules, stage 2.'; $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modpost @@ -968,7 +968,7 @@ modules: $(KBUILD_EXTMOD) modules_install: $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.modinst -clean-dirs := _clean_$(KBUILD_EXTMOD) +clean-dirs := $(addprefix _clean_,$(KBUILD_EXTMOD)) .PHONY: $(clean-dirs) clean $(clean-dirs): |