patch-2.1.68 linux/net/Makefile

• Lines: 86
• Date: Sun Nov 30 14:00:39 1997
• Orig file: v2.1.67/linux/net/Makefile
• Orig date: Thu Jul 17 10:06:09 1997

diff -u --recursive --new-file v2.1.67/linux/net/Makefile linux/net/Makefile
@@ -9,8 +9,8 @@
 
 MOD_SUB_DIRS := ipv4
 ALL_SUB_DIRS := 802 ax25 bridge core ethernet ipv4 ipv6 ipx unix appletalk \
-		netrom rose lapb x25 wanrouter sunrpc #decnet
-SUB_DIRS     := core ethernet unix
+		netrom rose lapb x25 wanrouter netlink sched packet sunrpc #decnet
+SUB_DIRS     := core ethernet sched
 MOD_LIST_NAME := NET_MISC_MODULES
 
 ifeq ($(CONFIG_NET),y)
@@ -21,6 +21,14 @@
 SUB_DIRS += ipv4
 endif
 
+ifeq ($(CONFIG_UNIX),y)
+SUB_DIRS += unix
+else
+  ifeq ($(CONFIG_UNIX),m)
+  MOD_SUB_DIRS += unix
+  endif
+endif
+
 ifeq ($(CONFIG_IPV6),y)
 SUB_DIRS += ipv6
 else
@@ -29,6 +37,25 @@
   endif
 endif
 
+ifeq ($(CONFIG_NETLINK),y)
+SUB_DIRS += netlink
+  ifeq ($(CONFIG_NETLINK_DEV),m)
+    MOD_SUB_DIRS += netlink
+  endif
+endif
+
+ifeq ($(CONFIG_PACKET),y)
+SUB_DIRS += packet
+else
+  ifeq ($(CONFIG_PACKET),m)
+    MOD_SUB_DIRS += packet
+  endif
+endif
+
+ifeq ($(CONFIG_NET_SCHED),y)
+  MOD_SUB_DIRS += sched
+endif
+
 ifeq ($(CONFIG_BRIDGE),y)
 SUB_DIRS += bridge
 endif
@@ -133,33 +160,6 @@
 
 ifeq ($(CONFIG_SYSCTL),y)
 L_OBJS += sysctl_net.o
-endif
-
-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
-  ifdef CONFIG_NETLINK_MODULE
-    M_OBJS += netlink.o
-  endif
 endif
 
 include $(TOPDIR)/Rules.make