* [RESEND PATCH 01/27] kernel: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 02/27] alpha: change to new flag variables matt mooney
` (26 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
kernel/gcov/Makefile | 2 +-
kernel/power/Makefile | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/gcov/Makefile b/kernel/gcov/Makefile
index 3f76100..e97ca59 100644
--- a/kernel/gcov/Makefile
+++ b/kernel/gcov/Makefile
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"'
+ccflags-y := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"'
obj-$(CONFIG_GCOV_KERNEL) := base.o fs.o gcc_3_4.o
diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index c350e18..c5ebc6a 100644
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -1,4 +1,5 @@
-ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG
+
+ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG
obj-$(CONFIG_PM) += main.o
obj-$(CONFIG_PM_SLEEP) += console.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 02/27] alpha: change to new flag variables
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
2011-01-14 14:12 ` [RESEND PATCH 01/27] kernel: change to new flag variable matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 03/27] arm: " matt mooney
` (25 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/alpha/kernel/Makefile | 4 ++--
arch/alpha/lib/Makefile | 4 ++--
arch/alpha/math-emu/Makefile | 2 +-
arch/alpha/mm/Makefile | 2 +-
arch/alpha/oprofile/Makefile | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile
index 1ee9b5b..9bb7b85 100644
--- a/arch/alpha/kernel/Makefile
+++ b/arch/alpha/kernel/Makefile
@@ -3,8 +3,8 @@
#
extra-y := head.o vmlinux.lds
-EXTRA_AFLAGS := $(KBUILD_CFLAGS)
-EXTRA_CFLAGS := -Werror -Wno-sign-compare
+asflags-y := $(KBUILD_CFLAGS)
+ccflags-y := -Werror -Wno-sign-compare
obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o \
irq_alpha.o signal.o setup.o ptrace.o time.o \
diff --git a/arch/alpha/lib/Makefile b/arch/alpha/lib/Makefile
index 9b72c59..c0a83ab 100644
--- a/arch/alpha/lib/Makefile
+++ b/arch/alpha/lib/Makefile
@@ -2,8 +2,8 @@
# Makefile for alpha-specific library files..
#
-EXTRA_AFLAGS := $(KBUILD_CFLAGS)
-EXTRA_CFLAGS := -Werror
+asflags-y := $(KBUILD_CFLAGS)
+ccflags-y := -Werror
# Many of these routines have implementations tuned for ev6.
# Choose them iff we're targeting ev6 specifically.
diff --git a/arch/alpha/math-emu/Makefile b/arch/alpha/math-emu/Makefile
index 359ef08..7f46719 100644
--- a/arch/alpha/math-emu/Makefile
+++ b/arch/alpha/math-emu/Makefile
@@ -2,7 +2,7 @@
# Makefile for the FPU instruction emulation.
#
-EXTRA_CFLAGS := -w
+ccflags-y := -w
obj-$(CONFIG_MATHEMU) += math-emu.o
diff --git a/arch/alpha/mm/Makefile b/arch/alpha/mm/Makefile
index 09399c5..c993d3f 100644
--- a/arch/alpha/mm/Makefile
+++ b/arch/alpha/mm/Makefile
@@ -2,7 +2,7 @@
# Makefile for the linux alpha-specific parts of the memory manager.
#
-EXTRA_CFLAGS := -Werror
+ccflags-y := -Werror
obj-y := init.o fault.o extable.o
diff --git a/arch/alpha/oprofile/Makefile b/arch/alpha/oprofile/Makefile
index 4aa5624..3473de7 100644
--- a/arch/alpha/oprofile/Makefile
+++ b/arch/alpha/oprofile/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS := -Werror -Wno-sign-compare
+ccflags-y := -Werror -Wno-sign-compare
obj-$(CONFIG_OPROFILE) += oprofile.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 03/27] arm: change to new flag variables
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
2011-01-14 14:12 ` [RESEND PATCH 01/27] kernel: change to new flag variable matt mooney
2011-01-14 14:12 ` [RESEND PATCH 02/27] alpha: change to new flag variables matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 04/27] h8300: change to new flag variable matt mooney
` (24 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/arm/boot/compressed/Makefile | 4 ++--
arch/arm/vfp/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 0a8f748..0a53b8a 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -80,8 +80,8 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
endif
-EXTRA_CFLAGS := -fpic -fno-builtin
-EXTRA_AFLAGS := -Wa,-march=all
+ccflags-y := -fpic -fno-builtin
+asflags-y := -Wa,-march=all
# Supply ZRELADDR to the decompressor via a linker symbol.
ifneq ($(CONFIG_AUTO_ZRELADDR),y)
diff --git a/arch/arm/vfp/Makefile b/arch/arm/vfp/Makefile
index 39f6d8e..6de73aa 100644
--- a/arch/arm/vfp/Makefile
+++ b/arch/arm/vfp/Makefile
@@ -4,8 +4,8 @@
# Copyright (C) 2001 ARM Limited
#
-# EXTRA_CFLAGS := -DDEBUG
-# EXTRA_AFLAGS := -DDEBUG
+# ccflags-y := -DDEBUG
+# asflags-y := -DDEBUG
KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp)
LDFLAGS +=--no-warn-mismatch
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 04/27] h8300: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (2 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 03/27] arm: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 05/27] ia64: change to new flag variables matt mooney
` (23 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_AFLAGS with asflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/h8300/boot/compressed/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/h8300/boot/compressed/Makefile b/arch/h8300/boot/compressed/Makefile
index d6189e0..6745cb1 100644
--- a/arch/h8300/boot/compressed/Makefile
+++ b/arch/h8300/boot/compressed/Makefile
@@ -5,7 +5,7 @@
#
targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
-EXTRA_AFLAGS := -traditional
+asflags-y := -traditional
OBJECTS = $(obj)/head.o $(obj)/misc.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 05/27] ia64: change to new flag variables
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (3 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 04/27] h8300: change to new flag variable matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 06/27] m68k: " matt mooney
` (22 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/ia64/kvm/Makefile | 4 ++--
arch/ia64/sn/kernel/Makefile | 2 +-
arch/ia64/sn/kernel/sn2/Makefile | 2 +-
arch/ia64/sn/pci/Makefile | 2 +-
arch/ia64/sn/pci/pcibr/Makefile | 2 +-
arch/ia64/uv/kernel/Makefile | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index 1089b3e..db3d7c5 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -45,8 +45,8 @@ FORCE : $(obj)/$(offsets-file)
# Makefile for Kernel-based Virtual Machine module
#
-EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
-EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
+ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
+asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
coalesced_mmio.o irq_comm.o assigned-dev.o)
diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile
index 0591038..d27df1d 100644
--- a/arch/ia64/sn/kernel/Makefile
+++ b/arch/ia64/sn/kernel/Makefile
@@ -7,7 +7,7 @@
# Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc. All Rights Reserved.
#
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \
huberror.o io_acpi_init.o io_common.o \
diff --git a/arch/ia64/sn/kernel/sn2/Makefile b/arch/ia64/sn/kernel/sn2/Makefile
index 08e6565..3d09108 100644
--- a/arch/ia64/sn/kernel/sn2/Makefile
+++ b/arch/ia64/sn/kernel/sn2/Makefile
@@ -9,7 +9,7 @@
# sn2 specific kernel files
#
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
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
diff --git a/arch/ia64/sn/pci/Makefile b/arch/ia64/sn/pci/Makefile
index ad4ef34..df2a901 100644
--- a/arch/ia64/sn/pci/Makefile
+++ b/arch/ia64/sn/pci/Makefile
@@ -7,6 +7,6 @@
#
# Makefile for the sn pci general routines.
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/
diff --git a/arch/ia64/sn/pci/pcibr/Makefile b/arch/ia64/sn/pci/pcibr/Makefile
index 01192d3..396bcae 100644
--- a/arch/ia64/sn/pci/pcibr/Makefile
+++ b/arch/ia64/sn/pci/pcibr/Makefile
@@ -7,7 +7,7 @@
#
# Makefile for the sn2 io routines.
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
obj-y += pcibr_dma.o pcibr_reg.o \
pcibr_ate.o pcibr_provider.o
diff --git a/arch/ia64/uv/kernel/Makefile b/arch/ia64/uv/kernel/Makefile
index 8d92b46..124e441 100644
--- a/arch/ia64/uv/kernel/Makefile
+++ b/arch/ia64/uv/kernel/Makefile
@@ -7,7 +7,7 @@
# Copyright (C) 2008 Silicon Graphics, Inc. All Rights Reserved.
#
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
obj-y += setup.o
obj-$(CONFIG_IA64_GENERIC) += machvec.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 06/27] m68k: change to new flag variables
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (4 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 05/27] ia64: change to new flag variables matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 07/27] microblaze: change to new flag variable matt mooney
` (21 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/m68k/math-emu/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/m68k/math-emu/Makefile b/arch/m68k/math-emu/Makefile
index a0935bf..547c23c 100644
--- a/arch/m68k/math-emu/Makefile
+++ b/arch/m68k/math-emu/Makefile
@@ -2,8 +2,8 @@
# Makefile for the linux kernel.
#
-#EXTRA_AFLAGS += -DFPU_EMU_DEBUG
-#EXTRA_CFLAGS += -DFPU_EMU_DEBUG
+#asflags-y := -DFPU_EMU_DEBUG
+#ccflags-y := -DFPU_EMU_DEBUG
obj-y := fp_entry.o fp_scan.o fp_util.o fp_move.o fp_movem.o \
fp_cond.o fp_arith.o fp_log.o fp_trig.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 07/27] microblaze: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (5 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 06/27] m68k: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 08/27] mips: " matt mooney
` (20 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/microblaze/kernel/cpu/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/microblaze/kernel/cpu/Makefile b/arch/microblaze/kernel/cpu/Makefile
index 59cc7bc..fceed4e 100644
--- a/arch/microblaze/kernel/cpu/Makefile
+++ b/arch/microblaze/kernel/cpu/Makefile
@@ -6,7 +6,7 @@ ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_cache.o = -pg
endif
-EXTRA_CFLAGS += -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \
+ccflags-y := -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \
-DCPU_REV=$(CPU_REV)
obj-y += cache.o cpuinfo.o cpuinfo-pvr-full.o cpuinfo-static.o mb.o pvr.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 08/27] mips: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (6 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 07/27] microblaze: change to new flag variable matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 09/27] s390: " matt mooney
` (19 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/mips/Makefile | 4 ++--
arch/mips/bcm63xx/boards/Makefile | 2 +-
arch/mips/fw/arc/Makefile | 2 +-
arch/mips/jz4740/Makefile | 2 +-
arch/mips/oprofile/Makefile | 2 +-
arch/mips/pmc-sierra/yosemite/Makefile | 2 +-
arch/mips/powertv/Makefile | 2 +-
arch/mips/powertv/asic/Makefile | 2 +-
arch/mips/powertv/pci/Makefile | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 7c1102e..ac1d5b6 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -286,11 +286,11 @@ CLEAN_FILES += vmlinux.32 vmlinux.64
archprepare:
ifdef CONFIG_MIPS32_N32
@echo ' Checking missing-syscalls for N32'
- $(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=n32"
+ $(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=n32"
endif
ifdef CONFIG_MIPS32_O32
@echo ' Checking missing-syscalls for O32'
- $(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=32"
+ $(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=32"
endif
install:
diff --git a/arch/mips/bcm63xx/boards/Makefile b/arch/mips/bcm63xx/boards/Makefile
index e5cc86d..9f64fb4 100644
--- a/arch/mips/bcm63xx/boards/Makefile
+++ b/arch/mips/bcm63xx/boards/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
-EXTRA_CFLAGS += -Werror
+ccflags-y := -Werror
diff --git a/arch/mips/fw/arc/Makefile b/arch/mips/fw/arc/Makefile
index e0aaad4..5314b37 100644
--- a/arch/mips/fw/arc/Makefile
+++ b/arch/mips/fw/arc/Makefile
@@ -9,4 +9,4 @@ lib-$(CONFIG_ARC_MEMORY) += memory.o
lib-$(CONFIG_ARC_CONSOLE) += arc_con.o
lib-$(CONFIG_ARC_PROMLIB) += promlib.o
-EXTRA_CFLAGS += -Werror
+ccflags-y := -Werror
diff --git a/arch/mips/jz4740/Makefile b/arch/mips/jz4740/Makefile
index a604eae..a9dff33 100644
--- a/arch/mips/jz4740/Makefile
+++ b/arch/mips/jz4740/Makefile
@@ -17,4 +17,4 @@ obj-$(CONFIG_JZ4740_QI_LB60) += board-qi_lb60.o
obj-$(CONFIG_PM) += pm.o
-EXTRA_CFLAGS += -Werror -Wall
+ccflags-y := -Werror -Wall
diff --git a/arch/mips/oprofile/Makefile b/arch/mips/oprofile/Makefile
index 02cc65e..4b9d704 100644
--- a/arch/mips/oprofile/Makefile
+++ b/arch/mips/oprofile/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS := -Werror
+ccflags-y := -Werror
obj-$(CONFIG_OPROFILE) += oprofile.o
diff --git a/arch/mips/pmc-sierra/yosemite/Makefile b/arch/mips/pmc-sierra/yosemite/Makefile
index b16f95c..02f5fb9 100644
--- a/arch/mips/pmc-sierra/yosemite/Makefile
+++ b/arch/mips/pmc-sierra/yosemite/Makefile
@@ -6,4 +6,4 @@ obj-y += irq.o prom.o py-console.o setup.o
obj-$(CONFIG_SMP) += smp.o
-EXTRA_CFLAGS += -Werror
+ccflags-y := -Werror
diff --git a/arch/mips/powertv/Makefile b/arch/mips/powertv/Makefile
index baf6e90..348d2e8 100644
--- a/arch/mips/powertv/Makefile
+++ b/arch/mips/powertv/Makefile
@@ -28,4 +28,4 @@ obj-y += init.o ioremap.o memory.o powertv_setup.o reset.o time.o \
obj-$(CONFIG_USB) += powertv-usb.o
-EXTRA_CFLAGS += -Wall
+ccflags-y := -Wall
diff --git a/arch/mips/powertv/asic/Makefile b/arch/mips/powertv/asic/Makefile
index f0e95dc..d810a33 100644
--- a/arch/mips/powertv/asic/Makefile
+++ b/arch/mips/powertv/asic/Makefile
@@ -20,4 +20,4 @@ obj-y += asic-calliope.o asic-cronus.o asic-gaia.o asic-zeus.o \
asic_devices.o asic_int.o irq_asic.o prealloc-calliope.o \
prealloc-cronus.o prealloc-cronuslite.o prealloc-gaia.o prealloc-zeus.o
-EXTRA_CFLAGS += -Wall -Werror
+ccflags-y := -Wall -Werror
diff --git a/arch/mips/powertv/pci/Makefile b/arch/mips/powertv/pci/Makefile
index f5c6246..5783201 100644
--- a/arch/mips/powertv/pci/Makefile
+++ b/arch/mips/powertv/pci/Makefile
@@ -18,4 +18,4 @@
obj-$(CONFIG_PCI) += fixup-powertv.o
-EXTRA_CFLAGS += -Wall -Werror
+ccflags-y := -Wall -Werror
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 09/27] s390: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (7 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 08/27] mips: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 10/27] um: change to new flag variables matt mooney
` (18 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/s390/boot/Makefile | 2 +-
arch/s390/kvm/Makefile | 2 +-
arch/s390/math-emu/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 8800cf09..635d677 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -6,7 +6,7 @@ COMPILE_VERSION := __linux_compile_version_id__`hostname | \
tr -c '[0-9A-Za-z]' '_'`__`date | \
tr -c '[0-9A-Za-z]' '_'`_t
-EXTRA_CFLAGS := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
+ccflags-y := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
targets := image
targets += bzImage
diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile
index e5221ec..860d265 100644
--- a/arch/s390/kvm/Makefile
+++ b/arch/s390/kvm/Makefile
@@ -8,7 +8,7 @@
common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)
-EXTRA_CFLAGS += -Ivirt/kvm -Iarch/s390/kvm
+ccflags-y := -Ivirt/kvm -Iarch/s390/kvm
kvm-objs := $(common-objs) kvm-s390.o sie64a.o intercept.o interrupt.o priv.o sigp.o diag.o
obj-$(CONFIG_KVM) += kvm.o
diff --git a/arch/s390/math-emu/Makefile b/arch/s390/math-emu/Makefile
index c848903..51d3995 100644
--- a/arch/s390/math-emu/Makefile
+++ b/arch/s390/math-emu/Makefile
@@ -4,4 +4,4 @@
obj-$(CONFIG_MATHEMU) := math.o
-EXTRA_CFLAGS := -I$(src) -Iinclude/math-emu -w
+ccflags-y := -I$(src) -Iinclude/math-emu -w
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 10/27] um: change to new flag variables
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (8 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 09/27] s390: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 11/27] xtensa: change to new flag variable matt mooney
` (17 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/um/sys-ppc/Makefile | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/um/sys-ppc/Makefile b/arch/um/sys-ppc/Makefile
index b8bc844..20d363b 100644
--- a/arch/um/sys-ppc/Makefile
+++ b/arch/um/sys-ppc/Makefile
@@ -6,7 +6,7 @@ OBJ = built-in.o
OBJS = ptrace.o sigcontext.o checksum.o miscthings.o misc.o \
ptrace_user.o sysrq.o
-EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
+asflags-y := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
all: $(OBJ)
@@ -15,10 +15,10 @@ $(OBJ): $(OBJS)
$(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@
ptrace_user.o: ptrace_user.c
- $(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+ $(CC) -D__KERNEL__ $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
sigcontext.o: sigcontext.c
- $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+ $(CC) $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
checksum.S:
rm -f $@
@@ -53,13 +53,13 @@ ppc_defs.h: mk_defs.c ppc_defs.head \
checksum.o: checksum.S
rm -f asm
ln -s $(srctree)/include/asm-ppc asm
- $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
+ $(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
rm -f asm
misc.o: misc.S ppc_defs.h
rm -f asm
ln -s $(srctree)/include/asm-ppc asm
- $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
+ $(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
rm -f asm
clean-files := $(OBJS) ppc_defs.h checksum.S mk_defs.c
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 11/27] xtensa: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (9 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 10/27] um: change to new flag variables matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 12/27] fs: " matt mooney
` (16 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
arch/xtensa/boot/Makefile | 2 +-
arch/xtensa/boot/lib/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile
index 8657c62..068f143 100644
--- a/arch/xtensa/boot/Makefile
+++ b/arch/xtensa/boot/Makefile
@@ -14,7 +14,7 @@ HOSTFLAGS += -Iarch/$(ARCH)/boot/include
BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#")
-export EXTRA_CFLAGS
+export ccflags-y
export BIG_ENDIAN
subdir-y := lib
diff --git a/arch/xtensa/boot/lib/Makefile b/arch/xtensa/boot/lib/Makefile
index d3d2aa2..ad8952e 100644
--- a/arch/xtensa/boot/lib/Makefile
+++ b/arch/xtensa/boot/lib/Makefile
@@ -6,7 +6,7 @@ zlib := inffast.c inflate.c inftrees.c
lib-y += $(zlib:.c=.o) zmem.o
-EXTRA_CFLAGS += -Ilib/zlib_inflate
+ccflags-y := -Ilib/zlib_inflate
quiet_cmd_copy_zlib = COPY $@
cmd_copy_zlib = cat $< > $@
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 12/27] fs: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (10 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 11/27] xtensa: change to new flag variable matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 13/27] char: " matt mooney
` (15 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y. And change ntfs-objs to ntfs-y
for cleaner conditional inclusion.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
fs/affs/Makefile | 2 +-
fs/coda/Makefile | 2 +-
fs/gfs2/Makefile | 2 +-
fs/jfs/Makefile | 2 +-
fs/ncpfs/Makefile | 2 +-
fs/ntfs/Makefile | 19 +++++++------------
fs/ocfs2/Makefile | 4 ++--
fs/ocfs2/dlm/Makefile | 2 +-
fs/ocfs2/dlmfs/Makefile | 2 +-
fs/reiserfs/Makefile | 4 +---
fs/xfs/Makefile | 7 ++-----
11 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/fs/affs/Makefile b/fs/affs/Makefile
index b2c4f54..3988b4a 100644
--- a/fs/affs/Makefile
+++ b/fs/affs/Makefile
@@ -2,7 +2,7 @@
# Makefile for the Linux affs filesystem routines.
#
-#EXTRA_CFLAGS=-DDEBUG=1
+#ccflags-y := -DDEBUG=1
obj-$(CONFIG_AFFS_FS) += affs.o
diff --git a/fs/coda/Makefile b/fs/coda/Makefile
index 6c22e61..1bab69a 100644
--- a/fs/coda/Makefile
+++ b/fs/coda/Makefile
@@ -9,4 +9,4 @@ coda-objs := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o \
# If you want debugging output, please uncomment the following line.
-# EXTRA_CFLAGS += -DDEBUG -DDEBUG_SMB_MALLOC=1
+# ccflags-y := -DDEBUG -DDEBUG_SMB_MALLOC=1
diff --git a/fs/gfs2/Makefile b/fs/gfs2/Makefile
index 21f7e46..f3d23ef 100644
--- a/fs/gfs2/Makefile
+++ b/fs/gfs2/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS := -I$(src)
+ccflags-y := -I$(src)
obj-$(CONFIG_GFS2_FS) += gfs2.o
gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \
glops.o inode.o log.o lops.o main.o meta_io.o \
diff --git a/fs/jfs/Makefile b/fs/jfs/Makefile
index 3adb639..a58fa72 100644
--- a/fs/jfs/Makefile
+++ b/fs/jfs/Makefile
@@ -13,4 +13,4 @@ jfs-y := super.o file.o inode.o namei.o jfs_mount.o jfs_umount.o \
jfs-$(CONFIG_JFS_POSIX_ACL) += acl.o
-EXTRA_CFLAGS += -D_JFS_4K
+ccflags-y := -D_JFS_4K
diff --git a/fs/ncpfs/Makefile b/fs/ncpfs/Makefile
index 68ea095..c66af56 100644
--- a/fs/ncpfs/Makefile
+++ b/fs/ncpfs/Makefile
@@ -11,6 +11,6 @@ ncpfs-$(CONFIG_NCPFS_EXTRAS) += symlink.o
ncpfs-$(CONFIG_NCPFS_NFS_NS) += symlink.o
# If you want debugging output, please uncomment the following line
-# EXTRA_CFLAGS += -DDEBUG_NCP=1
+# ccflags-y := -DDEBUG_NCP=1
CFLAGS_ncplib_kernel.o := -finline-functions
diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile
index 4ff028f..30206b2 100644
--- a/fs/ntfs/Makefile
+++ b/fs/ntfs/Makefile
@@ -2,18 +2,13 @@
obj-$(CONFIG_NTFS_FS) += ntfs.o
-ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
- index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \
- unistr.o upcase.o
+ntfs-y := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
+ index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \
+ unistr.o upcase.o
-EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.30\"
+ntfs-$(CONFIG_NTFS_RW) += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o
-ifeq ($(CONFIG_NTFS_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-y := -DNTFS_VERSION=\"2.1.30\"
+ccflags-$(CONFIG_NTFS_DEBUG) += -DDEBUG
+ccflags-$(CONFIG_NTFS_RW) += -DNTFS_RW
-ifeq ($(CONFIG_NTFS_RW),y)
-EXTRA_CFLAGS += -DNTFS_RW
-
-ntfs-objs += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o
-endif
diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile
index 07d9fd8..d8a0313 100644
--- a/fs/ocfs2/Makefile
+++ b/fs/ocfs2/Makefile
@@ -1,6 +1,6 @@
-EXTRA_CFLAGS += -Ifs/ocfs2
+ccflags-y := -Ifs/ocfs2
-EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
+ccflags-y += -DCATCH_BH_JBD_RACES
obj-$(CONFIG_OCFS2_FS) += \
ocfs2.o \
diff --git a/fs/ocfs2/dlm/Makefile b/fs/ocfs2/dlm/Makefile
index dcebf0d..c8a044e 100644
--- a/fs/ocfs2/dlm/Makefile
+++ b/fs/ocfs2/dlm/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -Ifs/ocfs2
+ccflags-y := -Ifs/ocfs2
obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o
diff --git a/fs/ocfs2/dlmfs/Makefile b/fs/ocfs2/dlmfs/Makefile
index df69b48..f14be89 100644
--- a/fs/ocfs2/dlmfs/Makefile
+++ b/fs/ocfs2/dlmfs/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -Ifs/ocfs2
+ccflags-y := -Ifs/ocfs2
obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o
diff --git a/fs/reiserfs/Makefile b/fs/reiserfs/Makefile
index 792b3cb..3c3b001 100644
--- a/fs/reiserfs/Makefile
+++ b/fs/reiserfs/Makefile
@@ -31,9 +31,7 @@ endif
# and causing a panic. Since this behavior only affects ppc32, this ifeq
# will work around it. If any other architecture displays this behavior,
# add it here.
-ifeq ($(CONFIG_PPC32),y)
-EXTRA_CFLAGS := $(call cc-ifversion, -lt, 0400, -O1)
-endif
+ccflags-$(CONFIG_PPC32) := $(call cc-ifversion, -lt, 0400, -O1)
TAGS:
etags *.c
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index faca449..82b1371 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -16,14 +16,11 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-EXTRA_CFLAGS += -I$(src) -I$(src)/linux-2.6
+ccflags-y := -I$(src) -I$(src)/linux-2.6
+ccflags-$(CONFIG_XFS_DEBUG) += -g
XFS_LINUX := linux-2.6
-ifeq ($(CONFIG_XFS_DEBUG),y)
- EXTRA_CFLAGS += -g
-endif
-
obj-$(CONFIG_XFS_FS) += xfs.o
xfs-y += linux-2.6/xfs_trace.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 13/27] char: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (11 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 12/27] fs: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 14/27] dma: " matt mooney
` (14 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/char/mwave/Makefile | 4 ++--
drivers/char/mwave/README | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/char/mwave/Makefile b/drivers/char/mwave/Makefile
index 26b4fce..efa6a82 100644
--- a/drivers/char/mwave/Makefile
+++ b/drivers/char/mwave/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_MWAVE) += mwave.o
mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o
# To have the mwave driver disable other uarts if necessary
-# EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES
+# ccflags-y := -DMWAVE_FUTZ_WITH_OTHER_DEVICES
# To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
-ccflags-y := -DMW_TRACE
+ccflags-y += -DMW_TRACE
diff --git a/drivers/char/mwave/README b/drivers/char/mwave/README
index 480251f..c2a58f4 100644
--- a/drivers/char/mwave/README
+++ b/drivers/char/mwave/README
@@ -11,7 +11,7 @@ are not saved by the BIOS and so do not persist after unload and reload.
0x0008 tp3780i tracing
Tracing only occurs if the driver has been compiled with the
- MW_TRACE macro #defined (i.e. let EXTRA_CFLAGS += -DMW_TRACE
+ MW_TRACE macro #defined (i.e. let ccflags-y := -DMW_TRACE
in the Makefile).
mwave_3780i_irq=5/7/10/11/15
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 14/27] dma: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (12 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 13/27] char: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 15/27] hwmon: " matt mooney
` (13 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/dma/Makefile | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 64b21f5..1be065a 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -1,9 +1,5 @@
-ifeq ($(CONFIG_DMADEVICES_DEBUG),y)
- ccflags-y += -DDEBUG
-endif
-ifeq ($(CONFIG_DMADEVICES_VDEBUG),y)
- ccflags-y += -DVERBOSE_DEBUG
-endif
+ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG
+ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG
obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
obj-$(CONFIG_NET_DMA) += iovlock.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 15/27] hwmon: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (13 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 14/27] dma: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 16/27] ide: " matt mooney
` (12 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
---
drivers/hwmon/Makefile | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index dde02d9..974f9cc 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -112,7 +112,5 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
-ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 16/27] ide: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (14 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 15/27] hwmon: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 17/27] ieee802154: " matt mooney
` (11 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
---
drivers/ide/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 81df925..7f879b2 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -2,7 +2,7 @@
# link order is important here
#
-EXTRA_CFLAGS += -Idrivers/ide
+ccflags-y := -Idrivers/ide
ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \
ide-taskfile.o ide-pm.o ide-park.o ide-sysfs.o ide-devsets.o \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 17/27] ieee802154: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (15 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 16/27] ide: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 18/27] isdn: " matt mooney
` (10 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/ieee802154/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/ieee802154/Makefile b/drivers/ieee802154/Makefile
index e0e8e1a..6899913 100644
--- a/drivers/ieee802154/Makefile
+++ b/drivers/ieee802154/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o
-EXTRA_CFLAGS += -DDEBUG -DCONFIG_FFD
+ccflags-y := -DDEBUG -DCONFIG_FFD
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 18/27] isdn: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (16 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 17/27] ieee802154: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 19/27] memstick: " matt mooney
` (9 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
---
drivers/isdn/hisax/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile
index ab638b08..646368f 100644
--- a/drivers/isdn/hisax/Makefile
+++ b/drivers/isdn/hisax/Makefile
@@ -4,7 +4,7 @@
# Define maximum number of cards
-EXTRA_CFLAGS += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
+ccflags-y := -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o
obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 19/27] memstick: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (17 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 18/27] isdn: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 20/27] message: " matt mooney
` (8 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
The EXTRA_CFLAGS assignment in memstick/Makefile was not accomplishing
anything because this flag only has effect on sources at the same level
as the makefile (i.e., per directory). Since both core/ and host/ rely
on MEMSTICK_DEBUG, the subdir-ccflags-y variant seems to be the
appropriate choice.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/memstick/Makefile | 4 +---
drivers/memstick/core/Makefile | 4 ----
drivers/memstick/host/Makefile | 4 ----
3 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/drivers/memstick/Makefile b/drivers/memstick/Makefile
index dc160fb..9862359 100644
--- a/drivers/memstick/Makefile
+++ b/drivers/memstick/Makefile
@@ -2,9 +2,7 @@
# Makefile for the kernel MemoryStick device drivers.
#
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+subdir-ccflags-$(CONFIG_MEMSTICK_DEBUG) := -DDEBUG
obj-$(CONFIG_MEMSTICK) += core/
obj-$(CONFIG_MEMSTICK) += host/
diff --git a/drivers/memstick/core/Makefile b/drivers/memstick/core/Makefile
index 8b2b529..ecd0299 100644
--- a/drivers/memstick/core/Makefile
+++ b/drivers/memstick/core/Makefile
@@ -2,10 +2,6 @@
# Makefile for the kernel MemoryStick core.
#
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-
obj-$(CONFIG_MEMSTICK) += memstick.o
obj-$(CONFIG_MSPRO_BLOCK) += mspro_block.o
diff --git a/drivers/memstick/host/Makefile b/drivers/memstick/host/Makefile
index 12530e4..a1815e9 100644
--- a/drivers/memstick/host/Makefile
+++ b/drivers/memstick/host/Makefile
@@ -2,9 +2,5 @@
# Makefile for MemoryStick host controller drivers
#
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-
obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o
obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 20/27] message: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (18 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 19/27] memstick: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 21/27] misc: " matt mooney
` (7 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/message/fusion/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile
index 95c9532..d182a24 100644
--- a/drivers/message/fusion/Makefile
+++ b/drivers/message/fusion/Makefile
@@ -2,7 +2,7 @@
# enable verbose logging
# CONFIG_FUSION_LOGGING needs to be enabled in Kconfig
-#EXTRA_CFLAGS += -DMPT_DEBUG_VERBOSE
+#ccflags-y := -DMPT_DEBUG_VERBOSE
#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 21/27] misc: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (19 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 20/27] message: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 22/27] net: " matt mooney
` (6 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/misc/cb710/Makefile | 4 +---
drivers/misc/sgi-gru/Makefile | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/misc/cb710/Makefile b/drivers/misc/cb710/Makefile
index 7b80cbf..467c8e9 100644
--- a/drivers/misc/cb710/Makefile
+++ b/drivers/misc/cb710/Makefile
@@ -1,6 +1,4 @@
-ifeq ($(CONFIG_CB710_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CB710_DEBUG) := -DDEBUG
obj-$(CONFIG_CB710_CORE) += cb710.o
diff --git a/drivers/misc/sgi-gru/Makefile b/drivers/misc/sgi-gru/Makefile
index 7c4c306..0003a1d 100644
--- a/drivers/misc/sgi-gru/Makefile
+++ b/drivers/misc/sgi-gru/Makefile
@@ -1,6 +1,4 @@
-ifdef CONFIG_SGI_GRU_DEBUG
- EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_SGI_GRU_DEBUG) := -DDEBUG
obj-$(CONFIG_SGI_GRU) := gru.o
gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o grukdump.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 22/27] net: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (20 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 21/27] misc: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 23/27] pps: " matt mooney
` (5 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/caif/Makefile | 4 +---
drivers/net/skfp/Makefile | 2 +-
drivers/net/wan/lmc/Makefile | 2 +-
drivers/net/wireless/hostap/hostap_config.h | 4 ++--
drivers/net/wireless/zd1211rw/Makefile | 4 +---
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile
index b38d987..9560b9d 100644
--- a/drivers/net/caif/Makefile
+++ b/drivers/net/caif/Makefile
@@ -1,6 +1,4 @@
-ifeq ($(CONFIG_CAIF_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG
# Serial interface
obj-$(CONFIG_CAIF_TTY) += caif_serial.o
diff --git a/drivers/net/skfp/Makefile b/drivers/net/skfp/Makefile
index cb23580..b0be023 100644
--- a/drivers/net/skfp/Makefile
+++ b/drivers/net/skfp/Makefile
@@ -17,4 +17,4 @@ skfp-objs := skfddi.o hwmtm.o fplustm.o smt.o cfm.o \
# projects. To keep the source common for all those drivers (and
# thus simplify fixes to it), please do not clean it up!
-EXTRA_CFLAGS += -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
+ccflags-y := -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
diff --git a/drivers/net/wan/lmc/Makefile b/drivers/net/wan/lmc/Makefile
index dabdcfe..609710d 100644
--- a/drivers/net/wan/lmc/Makefile
+++ b/drivers/net/wan/lmc/Makefile
@@ -14,4 +14,4 @@ lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
# -DDEBUG \
# -DLMC_PACKET_LOG
-EXTRA_CFLAGS += -I. $(DBGDEF)
+ccflags-y := -I. $(DBGDEF)
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index 30acd39..2c8f71f 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -30,9 +30,9 @@
/* Following defines can be used to remove unneeded parts of the driver, e.g.,
* to limit the size of the kernel module. Definitions can be added here in
- * hostap_config.h or they can be added to make command with EXTRA_CFLAGS,
+ * hostap_config.h or they can be added to make command with ccflags-y,
* e.g.,
- * 'make pccard EXTRA_CFLAGS="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
+ * 'make pccard ccflags-y="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
*/
/* Do not include debug messages into the driver */
diff --git a/drivers/net/wireless/zd1211rw/Makefile b/drivers/net/wireless/zd1211rw/Makefile
index 1907eaf..5728a91 100644
--- a/drivers/net/wireless/zd1211rw/Makefile
+++ b/drivers/net/wireless/zd1211rw/Makefile
@@ -5,7 +5,5 @@ zd1211rw-objs := zd_chip.o zd_mac.o \
zd_rf_al7230b.o zd_rf_uw2453.o \
zd_rf.o zd_usb.o
-ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_ZD1211RW_DEBUG) := -DDEBUG
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 23/27] pps: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (21 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 22/27] net: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 24/27] rapidio: " matt mooney
` (4 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/pps/clients/Makefile | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/pps/clients/Makefile b/drivers/pps/clients/Makefile
index 42517da..4feb7e9 100644
--- a/drivers/pps/clients/Makefile
+++ b/drivers/pps/clients/Makefile
@@ -6,6 +6,4 @@ obj-$(CONFIG_PPS_CLIENT_KTIMER) += pps-ktimer.o
obj-$(CONFIG_PPS_CLIENT_LDISC) += pps-ldisc.o
obj-$(CONFIG_PPS_CLIENT_PARPORT) += pps_parport.o
-ifeq ($(CONFIG_PPS_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_PPS_DEBUG) := -DDEBUG
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 24/27] rapidio: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (22 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 23/27] pps: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 25/27] rtc: " matt mooney
` (3 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
switches/ depends on RAPIDIO_DEBUG so the subdir-ccflags-y variant
seems to be appropriate here.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/rapidio/Makefile | 4 +---
drivers/rapidio/switches/Makefile | 4 -----
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/drivers/rapidio/Makefile b/drivers/rapidio/Makefile
index b6139fe..89b8eca 100644
--- a/drivers/rapidio/Makefile
+++ b/drivers/rapidio/Makefile
@@ -5,6 +5,4 @@ obj-y += rio.o rio-access.o rio-driver.o rio-scan.o rio-sysfs.o
obj-$(CONFIG_RAPIDIO) += switches/
-ifeq ($(CONFIG_RAPIDIO_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+subdir-ccflags-$(CONFIG_RAPIDIO_DEBUG) := -DDEBUG
diff --git a/drivers/rapidio/switches/Makefile b/drivers/rapidio/switches/Makefile
index 48d67a6..c4d3acc 100644
--- a/drivers/rapidio/switches/Makefile
+++ b/drivers/rapidio/switches/Makefile
@@ -7,7 +7,3 @@ obj-$(CONFIG_RAPIDIO_CPS_XX) += idtcps.o
obj-$(CONFIG_RAPIDIO_TSI568) += tsi568.o
obj-$(CONFIG_RAPIDIO_TSI500) += tsi500.o
obj-$(CONFIG_RAPIDIO_CPS_GEN2) += idt_gen2.o
-
-ifeq ($(CONFIG_RAPIDIO_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 25/27] rtc: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (23 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 24/27] rapidio: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 26/27] scsi: " matt mooney
` (2 subsequent siblings)
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/rtc/Makefile | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 2afdaf3..5f6c383 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -2,9 +2,7 @@
# Makefile for RTC class/drivers.
#
-ifeq ($(CONFIG_RTC_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_RTC_DEBUG) := -DDEBUG
obj-$(CONFIG_RTC_LIB) += rtc-lib.o
obj-$(CONFIG_RTC_HCTOSYS) += hctosys.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 26/27] scsi: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (24 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 25/27] rtc: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-01-14 14:12 ` [RESEND PATCH 27/27] video: " matt mooney
2011-03-17 13:15 ` [RESEND PATCH 00/27] update makefiles to use the newer flag variables Michal Marek
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/scsi/aacraid/Makefile | 2 +-
drivers/scsi/aic94xx/Makefile | 4 +---
drivers/scsi/libsas/Makefile | 6 ++----
drivers/scsi/lpfc/Makefile | 6 ++----
drivers/scsi/mvsas/Makefile | 4 +---
drivers/scsi/pcmcia/Makefile | 2 +-
6 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/aacraid/Makefile b/drivers/scsi/aacraid/Makefile
index f1cca4e..92df4d6 100644
--- a/drivers/scsi/aacraid/Makefile
+++ b/drivers/scsi/aacraid/Makefile
@@ -5,4 +5,4 @@ obj-$(CONFIG_SCSI_AACRAID) := aacraid.o
aacraid-objs := linit.o aachba.o commctrl.o comminit.o commsup.o \
dpcsup.o rx.o sa.o rkt.o nark.o
-EXTRA_CFLAGS := -Idrivers/scsi
+ccflags-y := -Idrivers/scsi
diff --git a/drivers/scsi/aic94xx/Makefile b/drivers/scsi/aic94xx/Makefile
index e78ce0f..c0a15c7 100644
--- a/drivers/scsi/aic94xx/Makefile
+++ b/drivers/scsi/aic94xx/Makefile
@@ -22,9 +22,7 @@
# along with the aic94xx driver; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-ifeq ($(CONFIG_AIC94XX_DEBUG),y)
- EXTRA_CFLAGS += -DASD_DEBUG -DASD_ENTER_EXIT
-endif
+ccflags-$(CONFIG_AIC94XX_DEBUG) := -DASD_DEBUG -DASD_ENTER_EXIT
obj-$(CONFIG_SCSI_AIC94XX) += aic94xx.o
aic94xx-y += aic94xx_init.o \
diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile
index 1ad1323..c62aa7b 100644
--- a/drivers/scsi/libsas/Makefile
+++ b/drivers/scsi/libsas/Makefile
@@ -21,9 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-ifeq ($(CONFIG_SCSI_SAS_LIBSAS_DEBUG),y)
- EXTRA_CFLAGS += -DSAS_DEBUG
-endif
+ccflags-$(CONFIG_SCSI_SAS_LIBSAS_DEBUG) := -DSAS_DEBUG
obj-$(CONFIG_SCSI_SAS_LIBSAS) += libsas.o
libsas-y += sas_init.o \
@@ -36,4 +34,4 @@ libsas-y += sas_init.o \
sas_scsi_host.o \
sas_task.o
libsas-$(CONFIG_SCSI_SAS_ATA) += sas_ata.o
-libsas-$(CONFIG_SCSI_SAS_HOST_SMP) += sas_host_smp.o
\ No newline at end of file
+libsas-$(CONFIG_SCSI_SAS_HOST_SMP) += sas_host_smp.o
diff --git a/drivers/scsi/lpfc/Makefile b/drivers/scsi/lpfc/Makefile
index ad05d6e..14de249 100644
--- a/drivers/scsi/lpfc/Makefile
+++ b/drivers/scsi/lpfc/Makefile
@@ -19,10 +19,8 @@
# *******************************************************************/
######################################################################
-ifneq ($(GCOV),)
- EXTRA_CFLAGS += -fprofile-arcs -ftest-coverage
- EXTRA_CFLAGS += -O0
-endif
+ccflags-$(GCOV) := -fprofile-arcs -ftest-coverage
+ccflags-$(GCOV) += -O0
obj-$(CONFIG_SCSI_LPFC) := lpfc.o
diff --git a/drivers/scsi/mvsas/Makefile b/drivers/scsi/mvsas/Makefile
index 52ac426..ffbf759 100644
--- a/drivers/scsi/mvsas/Makefile
+++ b/drivers/scsi/mvsas/Makefile
@@ -21,9 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y)
- EXTRA_CFLAGS += -DMV_DEBUG
-endif
+ccflags-$(CONFIG_SCSI_MVSAS_DEBUG) := -DMV_DEBUG
obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
mvsas-y += mv_init.o \
diff --git a/drivers/scsi/pcmcia/Makefile b/drivers/scsi/pcmcia/Makefile
index eca3790..683bf14 100644
--- a/drivers/scsi/pcmcia/Makefile
+++ b/drivers/scsi/pcmcia/Makefile
@@ -1,5 +1,5 @@
-EXTRA_CFLAGS += -Idrivers/scsi
+ccflags-y := -Idrivers/scsi
# 16-bit client drivers
obj-$(CONFIG_PCMCIA_QLOGIC) += qlogic_cs.o
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* [RESEND PATCH 27/27] video: change to new flag variable
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (25 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 26/27] scsi: " matt mooney
@ 2011-01-14 14:12 ` matt mooney
2011-03-17 13:15 ` [RESEND PATCH 00/27] update makefiles to use the newer flag variables Michal Marek
27 siblings, 0 replies; 31+ messages in thread
From: matt mooney @ 2011-01-14 14:12 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
---
drivers/video/intelfb/Makefile | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/video/intelfb/Makefile b/drivers/video/intelfb/Makefile
index 6c782d3..f7d631e 100644
--- a/drivers/video/intelfb/Makefile
+++ b/drivers/video/intelfb/Makefile
@@ -4,7 +4,4 @@ intelfb-y := intelfbdrv.o intelfbhw.o
intelfb-$(CONFIG_FB_INTEL_I2C) += intelfb_i2c.o
intelfb-objs := $(intelfb-y)
-ifdef CONFIG_FB_INTEL_DEBUG
-#EXTRA_CFLAGS += -DDEBUG -DVERBOSE -DREGDUMP
-EXTRA_CFLAGS += -DDEBUG -DREGDUMP
-endif
+ccflags-$(CONFIG_FB_INTEL_DEBUG) := -DDEBUG -DREGDUMP
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [RESEND PATCH 00/27] update makefiles to use the newer flag variables
2011-01-14 14:12 [RESEND PATCH 00/27] update makefiles to use the newer flag variables matt mooney
` (26 preceding siblings ...)
2011-01-14 14:12 ` [RESEND PATCH 27/27] video: " matt mooney
@ 2011-03-17 13:15 ` Michal Marek
2011-03-17 13:19 ` Geert Uytterhoeven
27 siblings, 1 reply; 31+ messages in thread
From: Michal Marek @ 2011-03-17 13:15 UTC (permalink / raw)
To: matt mooney; +Cc: linux-kbuild, linux-kernel
On Fri, Jan 14, 2011 at 06:12:23AM -0800, matt mooney wrote:
> Hi Michal,
>
> These are the patches that never made their way into the linux-next tree.
> I have added all of the acks that came through.
>
> Thanks,
> matt
>
>
> matt mooney (27):
> kernel: change to new flag variable
> alpha: change to new flag variables
> arm: change to new flag variables
> h8300: change to new flag variable
> ia64: change to new flag variables
> m68k: change to new flag variables
> microblaze: change to new flag variable
> mips: change to new flag variable
> s390: change to new flag variable
> um: change to new flag variables
> xtensa: change to new flag variable
> fs: change to new flag variable
> char: change to new flag variable
> dma: change to new flag variable
> hwmon: change to new flag variable
> ide: change to new flag variable
> ieee802154: change to new flag variable
> isdn: change to new flag variable
> memstick: change to new flag variable
> message: change to new flag variable
> misc: change to new flag variable
> net: change to new flag variable
> pps: change to new flag variable
> rapidio: change to new flag variable
> rtc: change to new flag variable
> scsi: change to new flag variable
> video: change to new flag variable
I committed these to kbuild.2.6.git#trivial and will send a pull request
to Linus.
Thanks,
Michal
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [RESEND PATCH 00/27] update makefiles to use the newer flag variables
2011-03-17 13:15 ` [RESEND PATCH 00/27] update makefiles to use the newer flag variables Michal Marek
@ 2011-03-17 13:19 ` Geert Uytterhoeven
2011-03-17 13:31 ` Michal Marek
0 siblings, 1 reply; 31+ messages in thread
From: Geert Uytterhoeven @ 2011-03-17 13:19 UTC (permalink / raw)
To: Michal Marek; +Cc: matt mooney, linux-kbuild, linux-kernel
On Thu, Mar 17, 2011 at 14:15, Michal Marek <mmarek@suse.cz> wrote:
> On Fri, Jan 14, 2011 at 06:12:23AM -0800, matt mooney wrote:
>> These are the patches that never made their way into the linux-next tree.
>> I have added all of the acks that came through.
>> m68k: change to new flag variables
> I committed these to kbuild.2.6.git#trivial and will send a pull request
> to Linus.
JFYI, the m68k one went in last night through the m68k tree.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [RESEND PATCH 00/27] update makefiles to use the newer flag variables
2011-03-17 13:19 ` Geert Uytterhoeven
@ 2011-03-17 13:31 ` Michal Marek
0 siblings, 0 replies; 31+ messages in thread
From: Michal Marek @ 2011-03-17 13:31 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: matt mooney, linux-kbuild, linux-kernel
On 17.3.2011 14:19, Geert Uytterhoeven wrote:
> On Thu, Mar 17, 2011 at 14:15, Michal Marek <mmarek@suse.cz> wrote:
>> On Fri, Jan 14, 2011 at 06:12:23AM -0800, matt mooney wrote:
>>> These are the patches that never made their way into the linux-next tree.
>>> I have added all of the acks that came through.
>
>>> m68k: change to new flag variables
>
>> I committed these to kbuild.2.6.git#trivial and will send a pull request
>> to Linus.
>
> JFYI, the m68k one went in last night through the m68k tree.
I did a rebase onto linux-next and back, so that I don't duplicate
patches that have been picked up by subsystem maintainers already. This
is the resulting shortlog, m68k is not there:
matt mooney (25):
kernel: change to new flag variable
arm: change to new flag variables
h8300: change to new flag variable
ia64: change to new flag variables
microblaze: change to new flag variable
mips: change to new flag variable
s390: change to new flag variable
um: change to new flag variables
xtensa: change to new flag variable
fs: change to new flag variable
char: change to new flag variable
dma: change to new flag variable
hwmon: change to new flag variable
ide: change to new flag variable
ieee802154: change to new flag variable
isdn: change to new flag variable
memstick: change to new flag variable
message: change to new flag variable
misc: change to new flag variable
net: change to new flag variable
pps: change to new flag variable
rapidio: change to new flag variable
rtc: change to new flag variable
scsi: change to new flag variable
video: change to new flag variable
I guess I should be more verbose than "thanks, applied" next time :).
Michal
^ permalink raw reply [flat|nested] 31+ messages in thread