diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:48:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:48:48 -0500 |
| commit | 2e1ca21d46aaef95101723fa402f39d3a95aba59 (patch) | |
| tree | cd95efefb9ccb6ab4ac0589d01c06cdfc22cc989 /scripts/Makefile.modinst | |
| parent | 315ab19a6d12d6af7b6957090822f3057ab7e80f (diff) | |
| parent | eae0f536f640bb95f2ad437a57c40c7d5683d1ac (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
kbuild: remove obsoleted scripts/reference_* files
kbuild: fix make help & make *pkg
kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
Kconfig: remove the CONFIG_CC_ALIGN_* options
kbuild: add -fverbose-asm to i386 Makefile
kbuild: clean-up genksyms
kbuild: Lindent genksyms.c
kbuild: fix genksyms build error
kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
kbuild: replace PHONY with FORCE
kbuild: Fix bug in crc symbol generating of kernel and modules
kbuild: change kbuild to not rely on incorrect GNU make behavior
kbuild: when warning symbols exported twice now tell user this is the problem
kbuild: fix make dir/file.xx when asm symlink is missing
kbuild: in the section mismatch check try harder to find symbols
kbuild: fix section mismatch check for unwind on IA64
kbuild: kill false positives from section mismatch warnings for powerpc
kbuild: kill trailing whitespace in modpost & friends
kbuild: small update of allnoconfig description
kbuild: make namespace.pl CROSS_COMPILE happy
...
Trivial conflict in arch/ppc/boot/Makefile manually fixed up
Diffstat (limited to 'scripts/Makefile.modinst')
| -rw-r--r-- | scripts/Makefile.modinst | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index 23fd1bdc25c..2686dd5dce8 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Installing modules | 2 | # Installing modules |
| 3 | # ========================================================================== | 3 | # ========================================================================== |
| 4 | 4 | ||
| 5 | .PHONY: __modinst | 5 | PHONY := __modinst |
| 6 | __modinst: | 6 | __modinst: |
| 7 | 7 | ||
| 8 | include scripts/Kbuild.include | 8 | include scripts/Kbuild.include |
| @@ -12,7 +12,7 @@ include scripts/Kbuild.include | |||
| 12 | __modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod))) | 12 | __modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod))) |
| 13 | modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) | 13 | modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) |
| 14 | 14 | ||
| 15 | .PHONY: $(modules) | 15 | PHONY += $(modules) |
| 16 | __modinst: $(modules) | 16 | __modinst: $(modules) |
| 17 | @: | 17 | @: |
| 18 | 18 | ||
| @@ -27,3 +27,9 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) | |||
| 27 | 27 | ||
| 28 | $(modules): | 28 | $(modules): |
| 29 | $(call cmd,modules_install,$(MODLIB)/$(modinst_dir)) | 29 | $(call cmd,modules_install,$(MODLIB)/$(modinst_dir)) |
| 30 | |||
| 31 | |||
| 32 | # Declare the contents of the .PHONY variable as phony. We keep that | ||
| 33 | # information in a variable se we can use it in if_changed and friends. | ||
| 34 | |||
| 35 | .PHONY: $(PHONY) | ||
