patch-2.3.29 linux/drivers/net/Makefile

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

diff -u --recursive --new-file v2.3.28/linux/drivers/net/Makefile linux/drivers/net/Makefile
@@ -17,10 +17,10 @@
 SUB_DIRS     := 
 MOD_SUB_DIRS :=
 MOD_IN_SUB_DIRS :=
-ALL_SUB_DIRS := $(SUB_DIRS) fc hamradio irda pcmcia tokenring wan
+ALL_SUB_DIRS := $(SUB_DIRS) fc hamradio irda pcmcia tokenring wan sk98lin
 
-L_TARGET := net.a
-L_OBJS   := auto_irq.o
+O_TARGET := net.o
+O_OBJS   :=
 M_OBJS   :=
 MOD_LIST_NAME := NET_MODULES
 
@@ -48,6 +48,16 @@
   endif
 endif
 
+ifeq ($(CONFIG_SK98LIN),y)
+SUB_DIRS += sk98lin
+MOD_IN_SUB_DIRS += sk98lin
+L_OBJS += sk98lin/sk98lin.o
+else
+  ifeq ($(CONFIG_SK98LIN),m)
+  MOD_IN_SUB_DIRS += sk98lin
+  endif
+endif
+
 ifeq ($(CONFIG_TR),y)
 SUB_DIRS += tokenring
 MOD_IN_SUB_DIRS += tokenring
@@ -263,8 +273,7 @@
 M_OBJS          := $(sort $(filter-out $(export-objs), $(obj-m)))
 MX_OBJS         := $(sort $(filter     $(export-objs), $(obj-m)))
 
-L_OBJS += $(O_OBJS)
-L_OBJS += $(OX_OBJS)
+O_OBJS += auto_irq.o
 
 include $(TOPDIR)/Rules.make
 

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