diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /arch/i386/Makefile | |
parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386/Makefile')
-rw-r--r-- | arch/i386/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 314c7146e9bf..04783ceb050c 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile | |||
@@ -123,7 +123,7 @@ AFLAGS += $(mflags-y) | |||
123 | boot := arch/i386/boot | 123 | boot := arch/i386/boot |
124 | 124 | ||
125 | .PHONY: zImage bzImage compressed zlilo bzlilo \ | 125 | .PHONY: zImage bzImage compressed zlilo bzlilo \ |
126 | zdisk bzdisk fdimage fdimage144 fdimage288 install | 126 | zdisk bzdisk fdimage fdimage144 fdimage288 install kernel_install |
127 | 127 | ||
128 | all: bzImage | 128 | all: bzImage |
129 | 129 | ||
@@ -145,8 +145,9 @@ zdisk bzdisk: vmlinux | |||
145 | fdimage fdimage144 fdimage288: vmlinux | 145 | fdimage fdimage144 fdimage288: vmlinux |
146 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@ | 146 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@ |
147 | 147 | ||
148 | install: | 148 | install: vmlinux |
149 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@ | 149 | install kernel_install: |
150 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install | ||
150 | 151 | ||
151 | prepare: include/asm-$(ARCH)/asm_offsets.h | 152 | prepare: include/asm-$(ARCH)/asm_offsets.h |
152 | CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h | 153 | CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h |