[PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Tracey Dent]

Changed Makefile to use <modules>-y instead of <modules>-objs because -objs is
deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/hid/Makefile |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index c335605..dad858b 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the HID driver
 #
-hid-objs			:= hid-core.o hid-input.o
+hid-y			:= hid-core.o hid-input.o
 
 ifdef CONFIG_DEBUG_FS
 	hid-objs		+= hid-debug.o
@@ -11,18 +11,18 @@ obj-$(CONFIG_HID)		+= hid.o
 
 hid-$(CONFIG_HIDRAW)		+= hidraw.o
 
-hid-logitech-objs		:= hid-lg.o
+hid-logitech-y		:= hid-lg.o
 ifdef CONFIG_LOGITECH_FF
-	hid-logitech-objs	+= hid-lgff.o
+	hid-logitech-y	+= hid-lgff.o
 endif
 ifdef CONFIG_LOGIRUMBLEPAD2_FF
-	hid-logitech-objs	+= hid-lg2ff.o
+	hid-logitech-y	+= hid-lg2ff.o
 endif
 ifdef CONFIG_LOGIG940_FF
-	hid-logitech-objs	+= hid-lg3ff.o
+	hid-logitech-y	+= hid-lg3ff.o
 endif
 ifdef CONFIG_LOGIWII_FF
-	hid-logitech-objs	+= hid-lg4ff.o
+	hid-logitech-y	+= hid-lg4ff.o
 endif
 
 obj-$(CONFIG_HID_3M_PCT)	+= hid-3m-pct.o
-- 
1.7.3.1.104.gc752e

[PATCH 2/2] Drivers: hid: usbhid: Makefile: Cleaned up Makefile

[Tracey Dent]

Changed Makefile to use <modules>-y instead of <modules>-objs because -objs is
deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/hid/usbhid/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/hid/usbhid/Makefile b/drivers/hid/usbhid/Makefile
index 1329ecb..db3cf31 100644
--- a/drivers/hid/usbhid/Makefile
+++ b/drivers/hid/usbhid/Makefile
@@ -3,15 +3,15 @@
 #
 
 # Multipart objects.
-usbhid-objs	:= hid-core.o hid-quirks.o
+usbhid-y	:= hid-core.o hid-quirks.o
 
 # Optional parts of multipart objects.
 
 ifeq ($(CONFIG_USB_HIDDEV),y)
-	usbhid-objs	+= hiddev.o
+	usbhid-y	+= hiddev.o
 endif
 ifeq ($(CONFIG_HID_PID),y)
-	usbhid-objs	+= hid-pidff.o
+	usbhid-y	+= hid-pidff.o
 endif
 
 obj-$(CONFIG_USB_HID)		+= usbhid.o
-- 
1.7.3.1.104.gc752e

Re: [PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Jiri Kosina]

On Sun, 7 Nov 2010, Tracey Dent wrote:

> Changed Makefile to use <modules>-y instead of <modules>-objs because 
> -objs is deprecated and should now be switched. According to 
> (documentation/kbuild/makefiles.txt).

Actually, where exactly does this file document it?

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: [PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Tracey Dent]

On 11/15/10, Jiri Kosina <jkosina@suse.cz> wrote:
> On Sun, 7 Nov 2010, Tracey Dent wrote:
>
>> Changed Makefile to use <modules>-y instead of <modules>-objs because
>> -objs is deprecated and should now be switched. According to
>> (documentation/kbuild/makefiles.txt).
>
> Actually, where exactly does this file document it?
>

It documents how it should be done in the section entitled --- 3.7
Compilation flags (which starts on line 284).

> Thanks,
>
> --
> Jiri Kosina
> SUSE Labs, Novell Inc.
>

regards

Tracey Dent

Re: [PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Américo Wang]

On Sun, Nov 07, 2010 at 09:46:27AM -0500, Tracey Dent wrote:
>Changed Makefile to use <modules>-y instead of <modules>-objs because -objs is
>deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).
>
>Signed-off-by: Tracey Dent <tdent48227@gmail.com>

Acked-by: WANG Cong <xiyou.wangcong@gmail.com>

Re: [PATCH 2/2] Drivers: hid: usbhid: Makefile: Cleaned up Makefile

[Américo Wang]

On Sun, Nov 07, 2010 at 09:46:28AM -0500, Tracey Dent wrote:
>Changed Makefile to use <modules>-y instead of <modules>-objs because -objs is
>deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).
>
>Signed-off-by: Tracey Dent <tdent48227@gmail.com>

Acked-by: WANG Cong <xiyou.wangcong@gmail.com>

Thanks.

Re: [PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Dmitry Torokhov]

On Tue, Nov 16, 2010 at 10:28:19PM -0500, Tracey Dent wrote:
> On 11/15/10, Jiri Kosina <jkosina@suse.cz> wrote:
> > On Sun, 7 Nov 2010, Tracey Dent wrote:
> >
> >> Changed Makefile to use <modules>-y instead of <modules>-objs because
> >> -objs is deprecated and should now be switched. According to
> >> (documentation/kbuild/makefiles.txt).
> >
> > Actually, where exactly does this file document it?
> >
> 
> It documents how it should be done in the section entitled --- 3.7
> Compilation flags (which starts on line 284).
> 

Actually the only reference I could find is in 3.3:

        If a kernel module is built from several source files, you specify
        that you want to build a module in the same way as above; however,
        kbuild needs to know which object files you want to build your
        module from, so you have to tell it by setting a $(<module_name>-y)
        variable.

See commit 4f8272802739f5c6ce6b0a548810a181d2f1b652 for reasoning behind
the change.

Thanks.

-- 
Dmitry

Re: [PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Tracey Dent]

On 11/17/10, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
> On Tue, Nov 16, 2010 at 10:28:19PM -0500, Tracey Dent wrote:
>> On 11/15/10, Jiri Kosina <jkosina@suse.cz> wrote:
>> > On Sun, 7 Nov 2010, Tracey Dent wrote:
>> >
>> >> Changed Makefile to use <modules>-y instead of <modules>-objs because
>> >> -objs is deprecated and should now be switched. According to
>> >> (documentation/kbuild/makefiles.txt).
>> >
>> > Actually, where exactly does this file document it?
>> >
>>
>> It documents how it should be done in the section entitled --- 3.7
>> Compilation flags (which starts on line 284).
>>
>
> Actually the only reference I could find is in 3.3:
>
>         If a kernel module is built from several source files, you specify
>         that you want to build a module in the same way as above; however,
>         kbuild needs to know which object files you want to build your
>         module from, so you have to tell it by setting a $(<module_name>-y)
>         variable.
>
> See commit 4f8272802739f5c6ce6b0a548810a181d2f1b652 for reasoning behind
> the change.
>

You're right, I was thinking I changed to use ccflags-y flags. Sorry :(

> Thanks.
>
> --
> Dmitry
>

Thanks

Tracey Dent

Re: [PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Dmitry Torokhov]

On Sat, Nov 06, 2010 at 04:51:05PM -0400, Tracey Dent wrote:
> On 11/6/10, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
> > Hi Tracey,
> >
> > On Sat, Nov 06, 2010 at 03:07:43PM -0400, Tracey Dent wrote:
> >> Changed Makefile to use <modules>-y instead of <modules>-objs.
> >>
> >
> > Changelog normally should say why something has been done as what has
> > been done is pretty clear from the patch itself.
> >
> 
> Do you want me to resend patch with more descriptive changelog?
> 

Yes please.

-- 
Dmitry

Re: [PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Tracey Dent]

On 11/6/10, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
> Hi Tracey,
>
> On Sat, Nov 06, 2010 at 03:07:43PM -0400, Tracey Dent wrote:
>> Changed Makefile to use <modules>-y instead of <modules>-objs.
>>
>
> Changelog normally should say why something has been done as what has
> been done is pretty clear from the patch itself.
>

Do you want me to resend patch with more descriptive changelog?

> Thanks.
>
> --
> Dmitry
>

regards

td

Re: [PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Dmitry Torokhov]

Hi Tracey,

On Sat, Nov 06, 2010 at 03:07:43PM -0400, Tracey Dent wrote:
> Changed Makefile to use <modules>-y instead of <modules>-objs.
> 

Changelog normally should say why something has been done as what has
been done is pretty clear from the patch itself.

Thanks.

-- 
Dmitry

[PATCH 1/2] Drivers: hid: Makefile: Cleaned up Makefile

[Tracey Dent]

Changed Makefile to use <modules>-y instead of <modules>-objs.

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/hid/Makefile |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index c335605..dad858b 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the HID driver
 #
-hid-objs			:= hid-core.o hid-input.o
+hid-y			:= hid-core.o hid-input.o
 
 ifdef CONFIG_DEBUG_FS
 	hid-objs		+= hid-debug.o
@@ -11,18 +11,18 @@ obj-$(CONFIG_HID)		+= hid.o
 
 hid-$(CONFIG_HIDRAW)		+= hidraw.o
 
-hid-logitech-objs		:= hid-lg.o
+hid-logitech-y		:= hid-lg.o
 ifdef CONFIG_LOGITECH_FF
-	hid-logitech-objs	+= hid-lgff.o
+	hid-logitech-y	+= hid-lgff.o
 endif
 ifdef CONFIG_LOGIRUMBLEPAD2_FF
-	hid-logitech-objs	+= hid-lg2ff.o
+	hid-logitech-y	+= hid-lg2ff.o
 endif
 ifdef CONFIG_LOGIG940_FF
-	hid-logitech-objs	+= hid-lg3ff.o
+	hid-logitech-y	+= hid-lg3ff.o
 endif
 ifdef CONFIG_LOGIWII_FF
-	hid-logitech-objs	+= hid-lg4ff.o
+	hid-logitech-y	+= hid-lg4ff.o
 endif
 
 obj-$(CONFIG_HID_3M_PCT)	+= hid-3m-pct.o
-- 
1.7.3.1.104.gc752e