netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tracey Dent <tdent48227@gmail.com>
To: davem@davemloft.net
Cc: marcel@holtmann.org, padovan@profusion.mobi,
	linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org,
	sjur.brandeland@stericsson.com, socketcan@hartkopp.net,
	urs.thuermann@volkswagen.de, socketcan-core@lists.berlios.de,
	sage@newdream.net, ceph-devel@vger.kernel.org,
	wang840925@gmail.com, jlayton@redhat.com, kaber@trash.net,
	pekkas@netcore.fi, linux-kernel@vger.kernel.org,
	netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org,
	samuel@sortiz.org, Tracey Dent <tdent48227@gmail.com>
Subject: [PATCH 07/17] Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal  definitions
Date: Sun, 21 Nov 2010 20:03:18 -0500	[thread overview]
Message-ID: <1290387808-2239-8-git-send-email-tdent48227@gmail.com> (raw)
In-Reply-To: <1290387808-2239-1-git-send-email-tdent48227@gmail.com>

Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.

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

diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index 4811159..19eb59d 100644
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -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
-- 
1.7.3.2.245.g03276


  parent reply	other threads:[~2010-11-22  1:04 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-22  1:03 [PATCH 00/00] Remove deprecated items from Makefiles Tracey Dent
     [not found] ` <1290387808-2239-1-git-send-email-tdent48227-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-11-22  1:03   ` [PATCH 01/17] Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions Tracey Dent
2010-11-22  1:03   ` [PATCH 16/17] Net: sunrpc: auth_gss: " Tracey Dent
2010-11-22  1:03 ` [PATCH 02/17] Net: caif: Makefile: Remove deprecated items Tracey Dent
2010-11-22  1:03 ` [PATCH 03/17] Net: can: Makefile: Remove deprecated kbuild goal definitions Tracey Dent
2010-11-22  1:03 ` [PATCH 04/17] Net: ceph: Makefile: remove " Tracey Dent
2010-11-22  1:03 ` [PATCH 05/17] Net: dns_resolver: Makefile: Remove " Tracey Dent
2010-11-22  1:03 ` [PATCH 06/17] Net: econet: " Tracey Dent
2010-11-22  1:03 ` Tracey Dent [this message]
2010-11-22  1:03 ` [PATCH 08/17] Net: ipv6: netfiliter: " Tracey Dent
2010-11-22  1:03 ` [PATCH 09/17] Net: irda: ircomm: Makefile: Remove deprecated kbuild goal defintions Tracey Dent
2010-11-22  1:03 ` [PATCH 10/17] Net: irda: irlan: Makefile: Remove deprecated kbuild goal definitions Tracey Dent
2010-11-22  1:03 ` [PATCH 11/17] Net: irda: irnet: " Tracey Dent
2010-11-22  1:03 ` [PATCH 12/17] Net: lapb: " Tracey Dent
2010-11-22  1:03 ` [PATCH 13/17] Net: phonet: " Tracey Dent
2010-11-22  1:03 ` [PATCH 14/17] Net: rds: Makefile: Remove deprecated items Tracey Dent
2010-11-22  1:03 ` [PATCH 15/17] Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions Tracey Dent
2010-11-22  1:03 ` [PATCH 17/17] Net: wanrouter: " Tracey Dent
2010-11-22 16:17 ` [PATCH 00/00] Remove deprecated items from Makefiles David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1290387808-2239-8-git-send-email-tdent48227@gmail.com \
    --to=tdent48227@gmail.com \
    --cc=ceph-devel@vger.kernel.org \
    --cc=davem@davemloft.net \
    --cc=jlayton@redhat.com \
    --cc=kaber@trash.net \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcel@holtmann.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=netfilter@vger.kernel.org \
    --cc=padovan@profusion.mobi \
    --cc=pekkas@netcore.fi \
    --cc=sage@newdream.net \
    --cc=samuel@sortiz.org \
    --cc=sjur.brandeland@stericsson.com \
    --cc=socketcan-core@lists.berlios.de \
    --cc=socketcan@hartkopp.net \
    --cc=urs.thuermann@volkswagen.de \
    --cc=wang840925@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).