Remove deprecated items from Makefiles
Subsystems (13)
cover Remove deprecated items from Makefiles
I changed Makefiles to use <modules>-y instead of <modules>-objs because -objs is deprecated and not even mentioned in Documentation/kbuild/makefiles.txt.
Also, remove some if-conditional statments because I used the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS.
regards,
Tracey Dent
PATCH 1/17 Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/bluetooth/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/bluetooth/Makefile +1 -1
@@ -10,4 +10,4 @@ obj-$(CONFIG_BT_BNEP) += bnep/ obj-$(CONFIG_BT_CMTP) += cmtp/ obj-$(CONFIG_BT_HIDP) += hidp/ -bluetooth-objs := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o hci_sysfs.o lib.o +bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o hci_sysfs.o lib.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 2/17 Net: caif: Makefile: Remove deprecated items
In reply to Tracey DentChanged 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.
--- net/caif/Makefile | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
net/caif/Makefile +3 -5
@@ -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
Signature · 1 line
1.7.3.2.245.g03276
PATCH 3/17 Net: can: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/can/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
net/can/Makefile +3 -3
@@ -3,10 +3,10 @@ # obj-$(CONFIG_CAN) += can.o -can-objs := af_can.o proc.o +can-y := af_can.o proc.o obj-$(CONFIG_CAN_RAW) += can-raw.o -can-raw-objs := raw.o +can-raw-y := raw.o obj-$(CONFIG_CAN_BCM) += can-bcm.o -can-bcm-objs := bcm.o +can-bcm-y := bcm.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 4/17 Net: ceph: Makefile: remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/ceph/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/ceph/Makefile +1 -1
@@ -6,7 +6,7 @@ ifneq ($(KERNELRELEASE),) obj-$(CONFIG_CEPH_LIB) += libceph.o -libceph-objs := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \ +libceph-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \ mon_client.o \ osd_client.o osdmap.o crush/crush.o crush/mapper.o crush/hash.o \ debugfs.o \
Signature · 1 line
1.7.3.2.245.g03276
PATCH 5/17 Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/dns_resolver/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/dns_resolver/Makefile +1 -1
@@ -4,4 +4,4 @@ obj-$(CONFIG_DNS_RESOLVER) += dns_resolver.o -dns_resolver-objs := dns_key.o dns_query.o +dns_resolver-y := dns_key.o dns_query.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 6/17 Net: econet: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/econet/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/econet/Makefile +1 -1
@@ -4,4 +4,4 @@ obj-$(CONFIG_ECONET) += econet.o -econet-objs := af_econet.o +econet-y := af_econet.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 7/17 Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/ipv4/netfilter/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
net/ipv4/netfilter/Makefile +3 -3
@@ -3,15 +3,15 @@ # # objects for l3 independent conntrack -nf_conntrack_ipv4-objs := nf_conntrack_l3proto_ipv4.o nf_conntrack_proto_icmp.o +nf_conntrack_ipv4-y := nf_conntrack_l3proto_ipv4.o nf_conntrack_proto_icmp.o ifeq ($(CONFIG_NF_CONNTRACK_PROC_COMPAT),y) ifeq ($(CONFIG_PROC_FS),y) nf_conntrack_ipv4-objs += nf_conntrack_l3proto_ipv4_compat.o endif endif -nf_nat-objs := nf_nat_core.o nf_nat_helper.o nf_nat_proto_unknown.o nf_nat_proto_common.o nf_nat_proto_tcp.o nf_nat_proto_udp.o nf_nat_proto_icmp.o -iptable_nat-objs := nf_nat_rule.o nf_nat_standalone.o +nf_nat-y := nf_nat_core.o nf_nat_helper.o nf_nat_proto_unknown.o nf_nat_proto_common.o nf_nat_proto_tcp.o nf_nat_proto_udp.o nf_nat_proto_icmp.o +iptable_nat-y := nf_nat_rule.o nf_nat_standalone.o # connection tracking obj-$(CONFIG_NF_CONNTRACK_IPV4) += nf_conntrack_ipv4.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 8/17 Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/ipv6/netfilter/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/ipv6/netfilter/Makefile +2 -2
@@ -11,13 +11,13 @@ obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o obj-$(CONFIG_IP6_NF_SECURITY) += ip6table_security.o # objects for l3 independent conntrack -nf_conntrack_ipv6-objs := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o +nf_conntrack_ipv6-y := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o # l3 independent conntrack obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o nf_defrag_ipv6.o # defrag -nf_defrag_ipv6-objs := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o +nf_defrag_ipv6-y := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o obj-$(CONFIG_NF_DEFRAG_IPV6) += nf_defrag_ipv6.o # matches
Signature · 1 line
1.7.3.2.245.g03276
PATCH 9/17 Net: irda: ircomm: Makefile: Remove deprecated kbuild goal defintions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/irda/ircomm/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/irda/ircomm/Makefile +2 -2
@@ -4,5 +4,5 @@ obj-$(CONFIG_IRCOMM) += ircomm.o ircomm-tty.o -ircomm-objs := ircomm_core.o ircomm_event.o ircomm_lmp.o ircomm_ttp.o -ircomm-tty-objs := ircomm_tty.o ircomm_tty_attach.o ircomm_tty_ioctl.o ircomm_param.o +ircomm-y := ircomm_core.o ircomm_event.o ircomm_lmp.o ircomm_ttp.o +ircomm-tty-y := ircomm_tty.o ircomm_tty_attach.o ircomm_tty_ioctl.o ircomm_param.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 10/17 Net: irda: irlan: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/irda/irlan/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/irda/irlan/Makefile +1 -1
@@ -4,4 +4,4 @@ obj-$(CONFIG_IRLAN) += irlan.o -irlan-objs := irlan_common.o irlan_eth.o irlan_event.o irlan_client.o irlan_provider.o irlan_filter.o irlan_provider_event.o irlan_client_event.o +irlan-y := irlan_common.o irlan_eth.o irlan_event.o irlan_client.o irlan_provider.o irlan_filter.o irlan_provider_event.o irlan_client_event.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 11/17 Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/irda/irnet/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/irda/irnet/Makefile +1 -1
@@ -4,4 +4,4 @@ obj-$(CONFIG_IRNET) += irnet.o -irnet-objs := irnet_ppp.o irnet_irda.o +irnet-y := irnet_ppp.o irnet_irda.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 12/17 Net: lapb: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/lapb/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/lapb/Makefile +1 -1
@@ -4,4 +4,4 @@ obj-$(CONFIG_LAPB) += lapb.o -lapb-objs := lapb_in.o lapb_out.o lapb_subr.o lapb_timer.o lapb_iface.o +lapb-y := lapb_in.o lapb_out.o lapb_subr.o lapb_timer.o lapb_iface.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 13/17 Net: phonet: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/phonet/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/phonet/Makefile +2 -2
@@ -1,6 +1,6 @@ obj-$(CONFIG_PHONET) += phonet.o pn_pep.o -phonet-objs := \ +phonet-y := \ pn_dev.o \ pn_netlink.o \ socket.o \
@@ -8,4 +8,4 @@ phonet-objs := \ sysctl.o \ af_phonet.o -pn_pep-objs := pep.o pep-gprs.o +pn_pep-y := pep.o pep-gprs.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 14/17 Net: rds: Makefile: Remove deprecated items
In reply to Tracey DentChanged 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.
--- net/rds/Makefile | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
net/rds/Makefile +3 -5
@@ -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
Signature · 1 line
1.7.3.2.245.g03276
PATCH 15/17 Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/rxrpc/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/rxrpc/Makefile +2 -2
@@ -2,7 +2,7 @@ # Makefile for Linux kernel RxRPC # -af-rxrpc-objs := \ +af-rxrpc-y := \ af_rxrpc.o \ ar-accept.o \ ar-ack.o \
@@ -21,7 +21,7 @@ af-rxrpc-objs := \ ar-transport.o ifeq ($(CONFIG_PROC_FS),y) -af-rxrpc-objs += ar-proc.o +af-rxrpc-y += ar-proc.o endif obj-$(CONFIG_AF_RXRPC) += af-rxrpc.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 16/17 Net: sunrpc: auth_gss: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/sunrpc/auth_gss/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/sunrpc/auth_gss/Makefile +2 -2
@@ -4,10 +4,10 @@ obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.o -auth_rpcgss-objs := auth_gss.o gss_generic_token.o \ +auth_rpcgss-y := auth_gss.o gss_generic_token.o \ gss_mech_switch.o svcauth_gss.o obj-$(CONFIG_RPCSEC_GSS_KRB5) += rpcsec_gss_krb5.o -rpcsec_gss_krb5-objs := gss_krb5_mech.o gss_krb5_seal.o gss_krb5_unseal.o \ +rpcsec_gss_krb5-y := gss_krb5_mech.o gss_krb5_seal.o gss_krb5_unseal.o \ gss_krb5_seqnum.o gss_krb5_wrap.o gss_krb5_crypto.o gss_krb5_keys.o
Signature · 1 line
1.7.3.2.245.g03276
PATCH 17/17 Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions
In reply to Tracey DentChanged Makefile to use <modules>-y instead of <modules>-objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt.
--- net/wanrouter/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/wanrouter/Makefile +1 -1
@@ -4,4 +4,4 @@ obj-$(CONFIG_WAN_ROUTER) += wanrouter.o -wanrouter-objs := wanproc.o wanmain.o +wanrouter-y := wanproc.o wanmain.o
Signature · 1 line
1.7.3.2.245.g03276
David Miller
maintainerFrom: Tracey Dent <[email protected]>
Date: Sun, 21 Nov 2010 20:03:11 -0500
Quoted 5 lines
I changed Makefiles to use <modules>-y instead of <modules>-objs because -objs is deprecated and not even mentioned in
Documentation/kbuild/makefiles.txt.Also, remove some if-conditional statments because I used the ccflags-$ flag instead of
EXTRA_CFLAGSbecauseEXTRA_CFLAGS.
All applied, thanks Tracey.