diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 03:08:24 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 03:08:24 -0400 |
| commit | ae31825e63e11188d96ad9c4d2d5d4e0fc798a75 (patch) | |
| tree | 0f42d023f7bda00cfb9d1cbcc8e245f69dcdf8c4 /arch | |
| parent | 00b3aa3fc9bd827caaa859de90d9eba831b77d40 (diff) | |
sh: Make O= builds work again.
Some of the paths were a bit broken, fix it up.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index 50c5cc31c302..859285d47a29 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile | |||
| @@ -135,17 +135,14 @@ boot := arch/sh/boot | |||
| 135 | 135 | ||
| 136 | CPPFLAGS_vmlinux.lds := -traditional | 136 | CPPFLAGS_vmlinux.lds := -traditional |
| 137 | 137 | ||
| 138 | ifneq ($(KBUILD_SRC),) | ||
| 139 | incdir-prefix := $(srctree)/include/asm-sh/ | 138 | incdir-prefix := $(srctree)/include/asm-sh/ |
| 140 | else | ||
| 141 | incdir-prefix := | ||
| 142 | endif | ||
| 143 | 139 | ||
| 144 | # Update machine arch and proc symlinks if something which affects | 140 | # Update machine arch and proc symlinks if something which affects |
| 145 | # them changed. We use .arch and .mach to indicate when they were | 141 | # them changed. We use .arch and .mach to indicate when they were |
| 146 | # updated last, otherwise make uses the target directory mtime. | 142 | # updated last, otherwise make uses the target directory mtime. |
| 147 | 143 | ||
| 148 | include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/auto.conf | 144 | include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) \ |
| 145 | include/config/auto.conf FORCE | ||
| 149 | @echo ' SYMLINK include/asm-sh/cpu -> include/asm-sh/$(cpuincdir-y)' | 146 | @echo ' SYMLINK include/asm-sh/cpu -> include/asm-sh/$(cpuincdir-y)' |
| 150 | $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi | 147 | $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi |
| 151 | $(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu | 148 | $(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu |
| @@ -155,7 +152,8 @@ include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/auto.conf | |||
| 155 | # don't, just reference the parent directory so the semantics are | 152 | # don't, just reference the parent directory so the semantics are |
| 156 | # kept roughly the same. | 153 | # kept roughly the same. |
| 157 | 154 | ||
| 158 | include/asm-sh/.mach: $(wildcard include/config/sh/*.h) include/config/auto.conf | 155 | include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \ |
| 156 | include/config/auto.conf FORCE | ||
| 159 | @echo -n ' SYMLINK include/asm-sh/mach -> ' | 157 | @echo -n ' SYMLINK include/asm-sh/mach -> ' |
| 160 | $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi | 158 | $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi |
| 161 | $(Q)if [ -d $(incdir-prefix)$(incdir-y) ]; then \ | 159 | $(Q)if [ -d $(incdir-prefix)$(incdir-y) ]; then \ |
| @@ -168,7 +166,7 @@ include/asm-sh/.mach: $(wildcard include/config/sh/*.h) include/config/auto.conf | |||
| 168 | fi | 166 | fi |
| 169 | @touch $@ | 167 | @touch $@ |
| 170 | 168 | ||
| 171 | archprepare: maketools include/asm-sh/.cpu include/asm-sh/.mach | 169 | archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools |
| 172 | 170 | ||
| 173 | PHONY += maketools FORCE | 171 | PHONY += maketools FORCE |
| 174 | maketools: include/linux/version.h FORCE | 172 | maketools: include/linux/version.h FORCE |