[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-24
Subject:    [NETFILTER]: Makefile and build fixes.
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2003-04-28 1:53:02
[Download RAW message or body]

ChangeSet 1.1122.2.5, 2003/04/27 18:53:02-07:00, laforge@netfilter.org

	[NETFILTER]: Makefile and build fixes.


# This patch includes the following deltas:
#	           ChangeSet	1.1122.2.4 -> 1.1122.2.5
#	net/ipv4/netfilter/Makefile	1.12    -> 1.13   
#	net/ipv4/netfilter/ip_conntrack_irc.c	1.5     -> 1.6    
#	net/ipv4/netfilter/ip_conntrack_amanda.c	1.1     -> 1.2    
#	net/ipv4/netfilter/ip_conntrack_ftp.c	1.8     -> 1.9    
#

 Makefile              |   12 +++++-------
 ip_conntrack_amanda.c |    2 ++
 ip_conntrack_ftp.c    |    2 --
 ip_conntrack_irc.c    |    2 --
 4 files changed, 7 insertions(+), 11 deletions(-)


diff -Nru a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
--- a/net/ipv4/netfilter/Makefile	Mon Apr 28 12:06:32 2003
+++ b/net/ipv4/netfilter/Makefile	Mon Apr 28 12:06:32 2003
@@ -31,27 +31,25 @@
 # connection tracking
 obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
 
-# Amanda protocol support
+# connection tracking helpers
 obj-$(CONFIG_IP_NF_AMANDA) += ip_conntrack_amanda.o
-obj-$(CONFIG_IP_NF_NAT_AMANDA) += ip_nat_amanda.o
-ifdef CONFIG_IP_NF_NAT_AMANDA
+ifdef CONFIG_IP_NF_AMANDA
 	export-objs += ip_conntrack_amanda.o
 endif
 
-
-# connection tracking helpers
 obj-$(CONFIG_IP_NF_TFTP) += ip_conntrack_tftp.o
 obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o
-ifdef CONFIG_IP_NF_NAT_FTP
+ifdef CONFIG_IP_NF_FTP
 	export-objs += ip_conntrack_ftp.o
 endif
 
 obj-$(CONFIG_IP_NF_IRC) += ip_conntrack_irc.o
-ifdef CONFIG_IP_NF_NAT_IRC
+ifdef CONFIG_IP_NF_IRC
 	export-objs += ip_conntrack_irc.o
 endif
 
 # NAT helpers 
+obj-$(CONFIG_IP_NF_NAT_AMANDA) += ip_nat_amanda.o
 obj-$(CONFIG_IP_NF_NAT_TFTP) += ip_nat_tftp.o
 obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o
 obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o
diff -Nru a/net/ipv4/netfilter/ip_conntrack_amanda.c b/net/ipv4/netfilter/ip_conntrack_amanda.c
--- a/net/ipv4/netfilter/ip_conntrack_amanda.c	Mon Apr 28 12:06:32 2003
+++ b/net/ipv4/netfilter/ip_conntrack_amanda.c	Mon Apr 28 12:06:32 2003
@@ -229,5 +229,7 @@
 	return 0;
 }
 
+EXPORT_SYMBOL(ip_amanda_lock);
+
 module_init(init);
 module_exit(fini);
diff -Nru a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c	Mon Apr 28 12:06:32 2003
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c	Mon Apr 28 12:06:32 2003
@@ -436,9 +436,7 @@
 	return 0;
 }
 
-#ifdef CONFIG_IP_NF_NAT_NEEDED
 EXPORT_SYMBOL(ip_ftp_lock);
-#endif
 
 MODULE_LICENSE("GPL");
 module_init(init);
diff -Nru a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c
--- a/net/ipv4/netfilter/ip_conntrack_irc.c	Mon Apr 28 12:06:32 2003
+++ b/net/ipv4/netfilter/ip_conntrack_irc.c	Mon Apr 28 12:06:32 2003
@@ -305,9 +305,7 @@
 	}
 }
 
-#ifdef CONFIG_IP_NF_NAT_NEEDED
 EXPORT_SYMBOL(ip_irc_lock);
-#endif
 
 module_init(init);
 module_exit(fini);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]