diff options
| author | Al Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2005-05-05 19:15:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 19:36:34 -0400 |
| commit | fcddd72e3e2565f8b838ae71a3e716a67f616160 (patch) | |
| tree | 4c598934d238cc3afce36550bb36e4facb747bec /arch | |
| parent | 03f81dc50caf6360aa5343264fed8868e22d9058 (diff) | |
[PATCH] uml: use variables rather than symlinks in dependencies
Use explicit os-... in make dependencies instead of playing with symlinks
(symlink in question is still created - it's needed for other things; however,
there's no reason to complicate ordering here).
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index f51643028edd..1d136640d360 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
| @@ -169,7 +169,7 @@ $(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h | |||
| 169 | $(ARCH_DIR)/include/task.h: $(ARCH_DIR)/util/mk_task | 169 | $(ARCH_DIR)/include/task.h: $(ARCH_DIR)/util/mk_task |
| 170 | $(call filechk,gen_header) | 170 | $(call filechk,gen_header) |
| 171 | 171 | ||
| 172 | $(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/os/util/mk_user_constants | 172 | $(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/os-$(OS)/util/mk_user_constants |
| 173 | $(call filechk,gen_header) | 173 | $(call filechk,gen_header) |
| 174 | 174 | ||
| 175 | $(ARCH_DIR)/include/kern_constants.h: $(ARCH_DIR)/util/mk_constants | 175 | $(ARCH_DIR)/include/kern_constants.h: $(ARCH_DIR)/util/mk_constants |
| @@ -178,7 +178,7 @@ $(ARCH_DIR)/include/kern_constants.h: $(ARCH_DIR)/util/mk_constants | |||
| 178 | $(ARCH_DIR)/include/skas_ptregs.h: $(ARCH_DIR)/kernel/skas/util/mk_ptregs | 178 | $(ARCH_DIR)/include/skas_ptregs.h: $(ARCH_DIR)/kernel/skas/util/mk_ptregs |
| 179 | $(call filechk,gen_header) | 179 | $(call filechk,gen_header) |
| 180 | 180 | ||
| 181 | $(ARCH_DIR)/os/util/mk_user_constants: $(ARCH_DIR)/os/util FORCE ; | 181 | $(ARCH_DIR)/os-$(OS)/util/mk_user_constants: $(ARCH_DIR)/os-$(OS)/util FORCE ; |
| 182 | 182 | ||
| 183 | $(ARCH_DIR)/util/mk_task $(ARCH_DIR)/util/mk_constants: $(ARCH_DIR)/include/user_constants.h $(ARCH_DIR)/util \ | 183 | $(ARCH_DIR)/util/mk_task $(ARCH_DIR)/util/mk_constants: $(ARCH_DIR)/include/user_constants.h $(ARCH_DIR)/util \ |
| 184 | FORCE ; | 184 | FORCE ; |
| @@ -191,7 +191,7 @@ $(ARCH_DIR)/util: scripts_basic $(SYS_DIR)/sc.h FORCE | |||
| 191 | $(ARCH_DIR)/kernel/skas/util: scripts_basic FORCE | 191 | $(ARCH_DIR)/kernel/skas/util: scripts_basic FORCE |
| 192 | $(Q)$(MAKE) $(build)=$@ | 192 | $(Q)$(MAKE) $(build)=$@ |
| 193 | 193 | ||
| 194 | $(ARCH_DIR)/os/util: scripts_basic FORCE | 194 | $(ARCH_DIR)/os-$(OS)/util: scripts_basic FORCE |
| 195 | $(Q)$(MAKE) $(build)=$@ | 195 | $(Q)$(MAKE) $(build)=$@ |
| 196 | 196 | ||
| 197 | export SUBARCH USER_CFLAGS OS | 197 | export SUBARCH USER_CFLAGS OS |