lkml.org 
[lkml]   [2010]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/24] memstick: change to new flag variable
    Date
    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>
    ---
    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.2.1


    \
     
     \ /
      Last update: 2010-09-27 20:09    [W:4.034 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site