patch-2.1.8 linux/net/Makefile

• Lines: 62
• Date: Sun Nov 3 11:04:43 1996
• Orig file: v2.1.7/linux/net/Makefile
• Orig date: Thu May 16 16:35:55 1996

diff -u --recursive --new-file v2.1.7/linux/net/Makefile linux/net/Makefile
@@ -8,18 +8,27 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 MOD_SUB_DIRS := ipv4
-ALL_SUB_DIRS := 802 ax25 bridge core ethernet ipv4 ipx unix appletalk netrom #decnet
+ALL_SUB_DIRS := 802 ax25 bridge core ethernet ipv4 ipv6 ipx unix appletalk \
+		netrom #decnet
 SUB_DIRS     := core ethernet unix
 MOD_LIST_NAME := NET_MISC_MODULES
 
 ifeq ($(CONFIG_NET),y)
 SUB_DIRS += 802
-endif
+endif 
 
 ifeq ($(CONFIG_INET),y)
 SUB_DIRS += ipv4
 endif
 
+ifeq ($(CONFIG_IPV6),y)
+SUB_DIRS += ipv6
+else
+  ifeq ($(CONFIG_IPV6),m)
+  MOD_SUB_DIRS += ipv6
+  endif
+endif
+
 ifeq ($(CONFIG_BRIDGE),y)
 SUB_DIRS += bridge
 endif
@@ -58,10 +67,29 @@
 
 M_OBJS	     :=
 
-ifeq ($(CONFIG_NETLINK),y)
+CONFIG_NETLINK_BUILTIN :=
+CONFIG_NETLINK_MODULE :=
+
+ifeq ($(CONFIG_NETLINK), y)
+  CONFIG_NETLINK_BUILTIN = y
+endif
+
+ifeq ($(CONFIG_IPV6), y)
+  CONFIG_NETLINK_BUILTIN = y
+endif
+
+ifeq ($(CONFIG_NETLINK), m)
+  CONFIG_NETLINK_MODULE = y
+endif
+
+ifeq ($(CONFIG_IPV6), m)
+  CONFIG_NETLINK_MODULE = y
+endif
+
+ifdef CONFIG_NETLINK_BUILTIN
 L_OBJS += netlink.o
 else
-  ifeq ($(CONFIG_NETLINK),m)
+  ifdef CONFIG_NETLINK_MODULE
     M_OBJS += netlink.o
   endif
 endif