diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:11:35 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:11:35 +0200 |
| commit | d7394fe57adbbd030c5a56f5f4579fe0478cdb9b (patch) | |
| tree | 8a56e7e456c0bc6356c113d89d98177a1b1c15b3 | |
| parent | f4b927a242a9d770947dd651d52f5f325a87a2d3 (diff) | |
i386: use full path for mach-xxx make rules
To simplify the scripted move of the mach-xxx directories, change
the makerules to the full arch/.... path.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/i386/Makefile | 18 | ||||
| -rw-r--r-- | arch/i386/mach-generic/Makefile | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 52b932478c6d..1bada3d878b7 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -61,36 +61,36 @@ AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONF CFLAGS += $(cflags-y) # Default subarch .c files -mcore-y := mach-default +mcore-y := arch/i386/mach-default # Voyager subarch support mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-i386/mach-voyager -mcore-$(CONFIG_X86_VOYAGER) := mach-voyager +mcore-$(CONFIG_X86_VOYAGER) := arch/i386/mach-voyager # VISWS subarch support mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-i386/mach-visws -mcore-$(CONFIG_X86_VISWS) := mach-visws +mcore-$(CONFIG_X86_VISWS) := arch/i386/mach-visws # NUMAQ subarch support mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-i386/mach-numaq -mcore-$(CONFIG_X86_NUMAQ) := mach-default +mcore-$(CONFIG_X86_NUMAQ) := arch/i386/mach-default # BIGSMP subarch support mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-i386/mach-bigsmp -mcore-$(CONFIG_X86_BIGSMP) := mach-default +mcore-$(CONFIG_X86_BIGSMP) := arch/i386/mach-default #Summit subarch support mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit -mcore-$(CONFIG_X86_SUMMIT) := mach-default +mcore-$(CONFIG_X86_SUMMIT) := arch/i386/mach-default # generic subarchitecture mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic -mcore-$(CONFIG_X86_GENERICARCH) := mach-default +mcore-$(CONFIG_X86_GENERICARCH) := arch/i386/mach-default core-$(CONFIG_X86_GENERICARCH) += arch/i386/mach-generic/ # ES7000 subarch support mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-i386/mach-es7000 -mcore-$(CONFIG_X86_ES7000) := mach-default +mcore-$(CONFIG_X86_ES7000) := arch/i386/mach-default core-$(CONFIG_X86_ES7000) := arch/i386/mach-es7000/ # Xen paravirtualization support @@ -104,7 +104,7 @@ head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task.o libs-y += arch/i386/lib/ core-y += arch/i386/kernel/ \ arch/i386/mm/ \ - arch/i386/$(mcore-y)/ \ + $(mcore-y)/ \ arch/i386/crypto/ drivers-$(CONFIG_MATH_EMULATION) += arch/i386/math-emu/ drivers-$(CONFIG_PCI) += arch/i386/pci/ diff --git a/arch/i386/mach-generic/Makefile b/arch/i386/mach-generic/Makefile index 6914485c0d85..2f216f55b2dd 100644 --- a/arch/i386/mach-generic/Makefile +++ b/arch/i386/mach-generic/Makefile @@ -4,4 +4,5 @@ EXTRA_CFLAGS := -Iarch/i386/kernel -obj-y := probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/ +obj-y := probe.o summit.o bigsmp.o es7000.o default.o +obj-y += ../../i386/mach-es7000/ |