Commit 103ec091 authored by Keith Owens's avatar Keith Owens Committed by Tony Luck

[IA64-SGI] Recursive flags do not work for selective builds

arch/ia64/sn/Makefile sets CPPFLAGS, expecting that setting to
propogate to all the subdirectories.  For a normal build with its
recursive descent it does work, but doing a selective build like
'make arch/ia64/sn/kernel/io_init.i' does not do a recursive descent,
it goes directly to arch/ia64/sn/kernel/Makefile so the flags do not
get set.

To support selective builds, set the flags in all the subordinate Makefiles.
Signed-off-by: default avatarKeith Owens <kaos@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 3ee68c4a
...@@ -9,6 +9,4 @@ ...@@ -9,6 +9,4 @@
# Makefile for the sn ia64 subplatform # Makefile for the sn ia64 subplatform
# #
CPPFLAGS += -I$(srctree)/arch/ia64/sn/include
obj-y += kernel/ pci/ obj-y += kernel/ pci/
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
# Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All Rights Reserved. # Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All Rights Reserved.
# #
CPPFLAGS += -I$(srctree)/arch/ia64/sn/include
obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \ obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \
huberror.o io_init.o iomv.o klconflib.o sn2/ huberror.o io_init.o iomv.o klconflib.o sn2/
obj-$(CONFIG_IA64_GENERIC) += machvec.o obj-$(CONFIG_IA64_GENERIC) += machvec.o
......
...@@ -9,5 +9,7 @@ ...@@ -9,5 +9,7 @@
# sn2 specific kernel files # sn2 specific kernel files
# #
CPPFLAGS += -I$(srctree)/arch/ia64/sn/include
obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \ obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o
...@@ -7,4 +7,6 @@ ...@@ -7,4 +7,6 @@
# #
# Makefile for the sn pci general routines. # Makefile for the sn pci general routines.
CPPFLAGS += -I$(srctree)/arch/ia64/sn/include
obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/ obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/
...@@ -7,5 +7,7 @@ ...@@ -7,5 +7,7 @@
# #
# Makefile for the sn2 io routines. # Makefile for the sn2 io routines.
CPPFLAGS += -I$(srctree)/arch/ia64/sn/include
obj-y += pcibr_dma.o pcibr_reg.o \ obj-y += pcibr_dma.o pcibr_reg.o \
pcibr_ate.o pcibr_provider.o pcibr_ate.o pcibr_provider.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment