patch-2.4.0-prerelease linux/drivers/net/Makefile

• Lines: 176
• Date: Fri Dec 29 14:07:22 2000
• Orig file: v2.4.0-test12/linux/drivers/net/Makefile
• Orig date: Sun Oct 8 10:50:18 2000

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/net/Makefile linux/drivers/net/Makefile
@@ -3,22 +3,12 @@
 # Makefile for the Linux network (ethercard) device drivers.
 #
 
-O_OBJS          :=
-M_OBJS          :=
-MX_OBJS         :=
-
-# Object file lists.
-
 obj-y           :=
 obj-m           :=
 obj-n           :=
 obj-            :=
 
-SUB_DIRS     := 
-MOD_SUB_DIRS :=
-MOD_IN_SUB_DIRS :=
-ALL_SUB_DIRS := $(SUB_DIRS) fc hamradio irda pcmcia tokenring wan sk98lin \
-		arcnet skfp tulip appletalk
+mod-subdirs     := appletalk arcnet fc irda tokenring pcmcia wan
 
 O_TARGET := net.o
 
@@ -26,83 +16,26 @@
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
 export-objs     :=	8390.o arlan.o aironet4500_core.o aironet4500_card.o ppp_async.o \
-			ppp_generic.o slhc.o pppox.o
-
-ifeq ($(CONFIG_PCMCIA),y)
-  SUB_DIRS += pcmcia
-  MOD_IN_SUB_DIRS += pcmcia
-else
-  ifeq ($(CONFIG_PCMCIA),m)
-    MOD_IN_SUB_DIRS += pcmcia
-  endif
-endif
+			ppp_generic.o slhc.o pppox.o auto_irq.o
 
 ifeq ($(CONFIG_TULIP),y)
-  SUB_DIRS += tulip
   obj-y += tulip/tulip.o
-else
-  ifeq ($(CONFIG_TULIP),m)
-    MOD_SUB_DIRS += tulip
-  endif
-endif
-
-ifeq ($(CONFIG_IRDA),y)
-SUB_DIRS += irda
-MOD_IN_SUB_DIRS += irda
-else
-  ifeq ($(CONFIG_IRDA),m)
-  MOD_IN_SUB_DIRS += irda
-  endif
-endif
-
-ifeq ($(CONFIG_TR),y)
-SUB_DIRS += tokenring
-MOD_IN_SUB_DIRS += tokenring
-else
-  ifeq ($(CONFIG_TR),m)
-  MOD_IN_SUB_DIRS += tokenring
-  endif
-endif
-
-ifeq ($(CONFIG_WAN),y)
-SUB_DIRS += wan
-MOD_IN_SUB_DIRS += wan
-else
-  ifeq ($(CONFIG_WAN),m)
-  MOD_IN_SUB_DIRS += wan
-  endif
-endif
-
-ifeq ($(CONFIG_NET_FC),y)
-SUB_DIRS += fc
-MOD_IN_SUB_DIRS += fc
-else
-  ifeq ($(CONFIG_NET_FC),m)
-  MOD_IN_SUB_DIRS += fc
-  endif
 endif
 
 ifeq ($(CONFIG_ISDN_PPP),y)
   obj-$(CONFIG_ISDN) += slhc.o
 endif
 
-ifeq ($(CONFIG_ARCNET),y)
-SUB_DIRS += arcnet
-MOD_IN_SUB_DIRS += arcnet
-else
-  ifeq ($(CONFIG_ARCNET),m)
-  MOD_IN_SUB_DIRS += arcnet
-  endif
-endif
-
-ifeq ($(CONFIG_APPLETALK),y)
-SUB_DIRS += appletalk
-MOD_IN_SUB_DIRS += appletalk
-else
-  ifeq ($(CONFIG_APPLETALK),m)
-  MOD_IN_SUB_DIRS += appletalk
-  endif
-endif
+subdir-$(CONFIG_PCMCIA) += pcmcia
+subdir-$(CONFIG_TULIP) += tulip
+subdir-$(CONFIG_IRDA) += irda
+subdir-$(CONFIG_TR) += tokenring
+subdir-$(CONFIG_WAN) += wan
+subdir-$(CONFIG_NET_FC) += fc
+subdir-$(CONFIG_ARCNET) += arcnet
+subdir-$(CONFIG_APPLETALK) += appletalk
+subdir-$(CONFIG_SK98LIN) += sk98lin
+subdir-$(CONFIG_SKFP) += skfp
 
 #
 # link order important here
@@ -140,21 +73,11 @@
 obj-$(CONFIG_STNIC) += stnic.o 8390.o
 
 ifeq ($(CONFIG_SK98LIN),y)
-SUB_DIRS += sk98lin
 obj-y += sk98lin/sk98lin.o
-else
-  ifeq ($(CONFIG_SK98LIN),m)
-  MOD_IN_SUB_DIRS += sk98lin
-  endif
 endif
 
 ifeq ($(CONFIG_SKFP),y)
-  SUB_DIRS += skfp
   obj-y += skfp/skfp.o
-else
-  ifeq ($(CONFIG_SKFP),m)
-    MOD_IN_SUB_DIRS += skfp
-  endif
 endif
 
 obj-$(CONFIG_VIA_RHINE) += via-rhine.o
@@ -281,33 +204,8 @@
 # HIPPI adapters
 #
 
-
-# Extract lists of the multi-part drivers.
-# The 'int-*' lists are the intermediate files used to build the multi's.
-
-multi-y         := $(filter $(list-multi), $(obj-y))
-multi-m         := $(filter $(list-multi), $(obj-m))
-int-y           := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
-int-m           := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
-
-# Files that are both resident and modular: remove from modular.
-
-obj-m           := $(filter-out $(obj-y), $(obj-m))
-int-m           := $(filter-out $(int-y), $(int-m))
-
-# Take multi-part drivers out of obj-y and put components in.
-
-obj-y           := $(filter-out $(list-multi), $(obj-y)) $(int-y)
-
-# Translate to Rules.make lists.
-
-O_OBJS          := $(filter-out $(export-objs), $(obj-y))
-OX_OBJS         := $(filter     $(export-objs), $(obj-y))
-M_OBJS          := $(sort $(filter-out $(export-objs), $(obj-m)))
-MX_OBJS         := $(sort $(filter     $(export-objs), $(obj-m)))
-
 ifneq ($(ARCH),s390)
-OX_OBJS += auto_irq.o
+obj-y += auto_irq.o
 endif
 
 include $(TOPDIR)/Rules.make