patch-2.3.15 linux/net/ipv4/Makefile

Next file: linux/net/ipv4/af_inet.c
Previous file: linux/net/ipv4/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.14/linux/net/ipv4/Makefile linux/net/ipv4/Makefile
@@ -8,7 +8,7 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET := ipv4.o
-IPV4_OBJS := utils.o route.o proc.o timer.o protocol.o \
+IPV4_OBJS := utils.o route.o proc.o protocol.o \
 	     ip_input.o ip_fragment.o ip_forward.o ip_options.o \
 	     ip_output.o ip_sockglue.o \
 	     tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o\
@@ -19,10 +19,6 @@
 MOD_LIST_NAME := IPV4_MODULES
 M_OBJS :=
 
-ifeq ($(CONFIG_IP_FIREWALL),y)
-IPV4_OBJS += ip_fw.o
-endif
-
 ifeq ($(CONFIG_IP_MULTIPLE_TABLES),y)
 IPV4_OBJS += fib_rules.o
 endif
@@ -35,14 +31,6 @@
 IPV4_OBJS += ipmr.o
 endif
 
-ifeq ($(CONFIG_INET_RARP),y)
-IPV4_OBJS += rarp.o
-else
-  ifeq ($(CONFIG_INET_RARP),m)
-  M_OBJS += rarp.o
-  endif
-endif
-
 ifeq ($(CONFIG_NET_IPIP),y)
 IPV4X_OBJS += ipip.o
 else
@@ -57,43 +45,6 @@
   ifeq ($(CONFIG_NET_IPGRE),m)
   MX_OBJS += ip_gre.o
   endif
-endif
-
-ifeq ($(CONFIG_IP_MASQUERADE),y)
-IPV4X_OBJS += ip_masq.o ip_masq_app.o 
-
-ifeq ($(CONFIG_IP_MASQUERADE_MOD),y)
-  IPV4X_OBJS += ip_masq_mod.o 
-  
-  ifeq ($(CONFIG_IP_MASQUERADE_IPAUTOFW),y)
-  IPV4_OBJS += ip_masq_autofw.o
-  else
-    ifeq ($(CONFIG_IP_MASQUERADE_IPAUTOFW),m)
-    M_OBJS += ip_masq_autofw.o
-    endif
-  endif
-  
-  ifeq ($(CONFIG_IP_MASQUERADE_IPPORTFW),y)
-  IPV4_OBJS += ip_masq_portfw.o
-  else
-    ifeq ($(CONFIG_IP_MASQUERADE_IPPORTFW),m)
-    M_OBJS += ip_masq_portfw.o
-    endif
-  endif
-  
-  ifeq ($(CONFIG_IP_MASQUERADE_MFW),y)
-  IPV4_OBJS += ip_masq_mfw.o
-  else
-    ifeq ($(CONFIG_IP_MASQUERADE_MFW),m)
-    M_OBJS += ip_masq_mfw.o
-    endif
-  endif
-
-endif
-
-M_OBJS += ip_masq_user.o
-M_OBJS += ip_masq_ftp.o ip_masq_irc.o ip_masq_raudio.o ip_masq_quake.o
-M_OBJS += ip_masq_vdolive.o ip_masq_cuseeme.o
 endif
 
 ifeq ($(CONFIG_SYN_COOKIES),y)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)