patch-2.3.13 linux/drivers/net/Makefile

• Lines: 90
• Date: Mon Aug 9 12:32:28 1999
• Orig file: v2.3.12/linux/drivers/net/Makefile
• Orig date: Thu Jul 8 15:42:20 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/net/Makefile linux/drivers/net/Makefile
@@ -302,16 +302,38 @@
 # bsd_comp.o is *always* a module, for some documented reason
 # (licensing).
 ifeq ($(CONFIG_PPP),y)
-LX_OBJS += ppp.o
-M_OBJS += bsd_comp.o
+LX_OBJS += ppp_generic.o
 CONFIG_SLHC_BUILTIN = y
-CONFIG_PPPDEF_BUILTIN = y
+  ifeq ($(CONFIG_PPP_ASYNC),y)
+  LX_OBJS += ppp_async.o
+  else
+    ifeq ($(CONFIG_PPP_ASYNC),m)
+    MX_OBJS += ppp_async.o
+    endif
+  endif
+  ifeq ($(CONFIG_PPP_DEFLATE),y)
+  CONFIG_PPPDEF_BUILTIN = y
+  else
+    ifeq ($(CONFIG_PPP_DEFLATE),m)
+    CONFIG_PPPDEF_MODULE = y
+    endif
+  endif
+  ifeq ($(CONFIG_PPP_BSDCOMP),m)
+  M_OBJS += bsd_comp.o
+  endif
 else
   ifeq ($(CONFIG_PPP),m)
+  MX_OBJS += ppp_generic.o
   CONFIG_SLHC_MODULE = y
-  CONFIG_PPPDEF_MODULE = y
-  MX_OBJS += ppp.o
-  M_OBJS += bsd_comp.o
+    ifeq ($(CONFIG_PPP_ASYNC),m)
+    MX_OBJS += ppp_async.o
+    endif
+    ifeq ($(CONFIG_PPP_DEFLATE),m)
+    CONFIG_PPPDEF_MODULE = y
+    endif
+    ifeq ($(CONFIG_PPP_BSDCOMP),m)
+    M_OBJS += bsd_comp.o
+    endif
   endif
 endif
 
@@ -845,13 +867,11 @@
 
 # if anything built-in uses ppp_deflate, then build it into the kernel also.
 # If not, but a module uses it, build as a module.
-# ... NO!!!  ppp_deflate.o does not work as resident;
-# it works only as a module!
 ifdef CONFIG_PPPDEF_BUILTIN
-MX_OBJS += ppp_deflate.o
+L_OBJS += ppp_deflate.o
 else
   ifdef CONFIG_PPPDEF_MODULE
-  MX_OBJS += ppp_deflate.o
+  M_OBJS += ppp_deflate.o
   endif
 endif
 
@@ -884,6 +904,17 @@
   M_OBJS += hplance.o
   endif
 endif
+
+ifeq ($(CONFIG_MVME147_NET),y)
+L_OBJS += mvme147.o
+CONFIG_7990_BUILTIN = y
+else
+  ifeq ($(CONFIG_MVME147_NET),m)
+  CONFIG_7990_MODULE = y
+  M_OBJS += mvme147.o
+  endif
+endif
+
 # If we need generic LANCE support, either in the kernel or as a module,
 # build it in the appropriate way.
 ifdef CONFIG_7990_BUILTIN
@@ -1054,6 +1085,10 @@
   ifeq ($(CONFIG_MACE),m)
   M_OBJS += mace.o
   endif
+endif
+
+ifeq ($(CONFIG_MACSONIC),y)
+L_OBJS += macsonic.o
 endif
 
 ifeq ($(CONFIG_BMAC),y)