]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Net: caif: Makefile: Remove deprecated items
authorTracey Dent <tdent48227@gmail.com>
Sun, 21 Nov 2010 15:03:13 +0000 (15:03 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Nov 2010 16:16:09 +0000 (08:16 -0800)
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.

Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
deprecated and should now be switched.

Last but not least, took out if-conditionals.

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/caif/Makefile

index f87481fb0e65e01ec278351ea489342bd83a7f3e..9d38e406e4a4937bf84ffba58e053bfb704ef51e 100644 (file)
@@ -1,8 +1,6 @@
-ifeq ($(CONFIG_CAIF_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CAIF_DEBUG)     :=      -DDEBUG
 
-caif-objs := caif_dev.o \
+caif-y := caif_dev.o \
        cfcnfg.o cfmuxl.o cfctrl.o  \
        cffrml.o cfveil.o cfdbgl.o\
        cfserl.o cfdgml.o  \
@@ -13,4 +11,4 @@ obj-$(CONFIG_CAIF) += caif.o
 obj-$(CONFIG_CAIF_NETDEV) += chnl_net.o
 obj-$(CONFIG_CAIF) += caif_socket.o
 
-export-objs := caif.o
+export-y := caif.o