[patch] netfilter: Use header-y instead of unifdef-y

[patch] netfilter: Use header-y instead of unifdef-y

[Simon Horman]

According to Documentation/kbuild/makefiles.txt
the usage of unifdef is deprecated.

Signed-off-by: Simon Horman <horms@verge.net.au>

Index: nf-next-2.6/include/linux/netfilter/Kbuild
===================================================================
--- nf-next-2.6.orig/include/linux/netfilter/Kbuild	2010-08-21 12:25:11.000000000 +0900
+++ nf-next-2.6/include/linux/netfilter/Kbuild	2010-08-23 12:37:45.000000000 +0900
@@ -1,8 +1,14 @@
+header-y += nf_conntrack_common.h
+header-y += nf_conntrack_ftp.h
 header-y += nf_conntrack_sctp.h
+header-y += nf_conntrack_tcp.h
 header-y += nf_conntrack_tuple_common.h
+header-y += nfnetlink.h
+header-y += nfnetlink_compat.h
 header-y += nfnetlink_conntrack.h
 header-y += nfnetlink_log.h
 header-y += nfnetlink_queue.h
+header-y += x_tables.h
 header-y += xt_CHECKSUM.h
 header-y += xt_CLASSIFY.h
 header-y += xt_CONNMARK.h
@@ -41,7 +47,9 @@ header-y += xt_mark.h
 header-y += xt_multiport.h
 header-y += xt_osf.h
 header-y += xt_owner.h
+header-y += xt_physdev.h
 header-y += xt_pkttype.h
+header-y += xt_policy.h
 header-y += xt_quota.h
 header-y += xt_rateest.h
 header-y += xt_realm.h
@@ -54,12 +62,3 @@ header-y += xt_tcpmss.h
 header-y += xt_tcpudp.h
 header-y += xt_time.h
 header-y += xt_u32.h
-
-unifdef-y += nf_conntrack_common.h
-unifdef-y += nf_conntrack_ftp.h
-unifdef-y += nf_conntrack_tcp.h
-unifdef-y += nfnetlink.h
-unifdef-y += nfnetlink_compat.h
-unifdef-y += x_tables.h
-unifdef-y += xt_physdev.h
-unifdef-y += xt_policy.h

Re: [patch] netfilter: Use header-y instead of unifdef-y

[Patrick McHardy]

Am 23.08.2010 05:42, schrieb Simon Horman:
> According to Documentation/kbuild/makefiles.txt
> the usage of unifdef is deprecated.
> 
> Signed-off-by: Simon Horman <horms@verge.net.au>

This has already been changed by this commit:

60641aa1f379820e99ac7f45a38b43795670c741
Author: Sam Ravnborg <sam@ravnborg.org>
Date:   Sat Aug 14 10:15:12 2010 +0200

    include: replace unifdef-y with header-y

    unifdef-y and header-y has same semantic.
    So there is no need to have both.

    Drop the unifdef-y variant and sort all lines again

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Re: [patch] netfilter: Use header-y instead of unifdef-y

[Simon Horman]

On Thu, Sep 16, 2010 at 10:30:19AM +0200, Patrick McHardy wrote:
> Am 23.08.2010 05:42, schrieb Simon Horman:
> > According to Documentation/kbuild/makefiles.txt
> > the usage of unifdef is deprecated.
> > 
> > Signed-off-by: Simon Horman <horms@verge.net.au>
> 
> This has already been changed by this commit:

Thanks, I had a feeling my change would be redundant.