summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTracey Dent <tdent48227@gmail.com>2010-11-21 15:03:25 +0000
committerDavid S. Miller <davem@davemloft.net>2010-11-22 08:16:15 -0800
commit094f2faaa2c4973e50979158f655a1d31a97ba98 (patch)
tree8b6750651a560689e62927192878e1520bfb1fcd
parent927a41f50c83b539fde5c01911f4968d717199bf (diff)
downloadlinux-3.10-094f2faaa2c4973e50979158f655a1d31a97ba98.tar.gz
linux-3.10-094f2faaa2c4973e50979158f655a1d31a97ba98.tar.bz2
linux-3.10-094f2faaa2c4973e50979158f655a1d31a97ba98.zip
Net: rds: Makefile: Remove deprecated items
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>
-rw-r--r--net/rds/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/rds/Makefile b/net/rds/Makefile
index b46eca10968..56d3f6023ce 100644
--- a/net/rds/Makefile
+++ b/net/rds/Makefile
@@ -4,7 +4,7 @@ rds-y := af_rds.o bind.o cong.o connection.o info.o message.o \
loop.o page.o rdma.o
obj-$(CONFIG_RDS_RDMA) += rds_rdma.o
-rds_rdma-objs := rdma_transport.o \
+rds_rdma-y := rdma_transport.o \
ib.o ib_cm.o ib_recv.o ib_ring.o ib_send.o ib_stats.o \
ib_sysctl.o ib_rdma.o \
iw.o iw_cm.o iw_recv.o iw_ring.o iw_send.o iw_stats.o \
@@ -12,10 +12,8 @@ rds_rdma-objs := rdma_transport.o \
obj-$(CONFIG_RDS_TCP) += rds_tcp.o
-rds_tcp-objs := tcp.o tcp_connect.o tcp_listen.o tcp_recv.o \
+rds_tcp-y := tcp.o tcp_connect.o tcp_listen.o tcp_recv.o \
tcp_send.o tcp_stats.o
-ifeq ($(CONFIG_RDS_DEBUG), y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_RDS_DEBUG) := -DDEBUG