Commit ff571d64 authored by Kai Germaschewski's avatar Kai Germaschewski

Link drivers/net/* from drivers/net/Makefile

Group knowledge about building objects and linking them together
instead of splitting it between the top-level Makefile and
the per-directory Makefiles.

This change tries to keep the link order the same as it was, at least
as far as possible. One critical point is that we now link
the pcmcia / wireless netdrivers before the pcmcia subsystem.
However, the pcmcia subsystem is initialized via a late_initcall(),
so this shouldn't make a difference.

drivers/net/Makefile looks a bit long now, but that can be improved
a lot, patch yet to come.
parent 5f2e2b74
......@@ -140,11 +140,6 @@ DRIVERS-y += drivers/base/base.o \
DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
DRIVERS-$(CONFIG_DEV_APPLETALK) += drivers/net/appletalk/appletalk.o
DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o
DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
......@@ -160,9 +155,6 @@ DRIVERS-$(CONFIG_SOUND) += sound/sound.o
DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
DRIVERS-$(CONFIG_NET_PCMCIA) += drivers/net/pcmcia/pcmcia_net.o
DRIVERS-$(CONFIG_NET_WIRELESS) += drivers/net/wireless/wireless_net.o
DRIVERS-$(CONFIG_NET_TULIP) += drivers/net/tulip/tulip_net.o
DRIVERS-$(CONFIG_PCMCIA_CHRDEV) += drivers/char/pcmcia/pcmcia_char.o
DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
......@@ -173,14 +165,12 @@ DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
DRIVERS-$(CONFIG_VT) += drivers/video/video.o
DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a
DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o
DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o
DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
......
......@@ -43,9 +43,6 @@ subdir-$(CONFIG_PNP) += pnp
subdir-$(CONFIG_ISDN) += isdn
subdir-$(CONFIG_ATM) += atm
subdir-$(CONFIG_FC4) += fc4
# CONFIG_HAMRADIO can be set without CONFIG_NETDEVICE being set -- ch
subdir-$(CONFIG_HAMRADIO) += net/hamradio
subdir-$(CONFIG_I2C) += i2c
subdir-$(CONFIG_ACPI) += acpi
......
......@@ -27,7 +27,6 @@ endif
subdir-$(CONFIG_NET_PCMCIA) += pcmcia
subdir-$(CONFIG_NET_WIRELESS) += wireless
subdir-$(CONFIG_NET_TULIP) += tulip
subdir-$(CONFIG_E100) += e100
ifeq ($(CONFIG_E100),y)
......@@ -39,13 +38,6 @@ ifeq ($(CONFIG_E1000),y)
obj-y += e1000/e1000.o
endif
subdir-$(CONFIG_IRDA) += irda
subdir-$(CONFIG_TR) += tokenring
subdir-$(CONFIG_WAN) += wan
subdir-$(CONFIG_NET_FC) += fc
subdir-$(CONFIG_ARCNET) += arcnet
subdir-$(CONFIG_DEV_APPLETALK) += appletalk
#
# link order important here
#
......@@ -223,6 +215,56 @@ ifeq ($(CONFIG_ARCH_ACORN),y)
obj-y += ../acorn/net/acorn-net.o
endif
subdir-$(CONFIG_NET_FC) += fc
ifeq ($(CONFIG_NET_FC),y)
obj-y += fc/fc.o
endif
subdir-$(CONFIG_DEV_APPLETALK) += appletalk
ifeq ($(CONFIG_DEV_APPLETALK),y)
obj-y += appletalk/appletalk.o
endif
subdir-$(CONFIG_TR) += tokenring
ifeq ($(CONFIG_TR),y)
obj-y += tokenring/tr.o
endif
subdir-$(CONFIG_WAN) += wan
ifeq ($(CONFIG_WAN),y)
obj-y += wan/wan.o
endif
subdir-$(CONFIG_ARCNET) += arcnet
ifeq ($(CONFIG_ARCNET),y)
obj-y += arcnet/arcnetdrv.o
endif
subdir-$(CONFIG_NET_PCMCIA) += pcmcia
ifeq ($(CONFIG_NET_PCMCIA),y)
obj-y += pcmcia/pcmcia_net.o
endif
subdir-$(CONFIG_NET_WIRELESS) += wireless
ifeq ($(CONFIG_NET_WIRELESS),y)
obj-y += wireless/wireless_net.o
endif
subdir-$(CONFIG_NET_TULIP) += tulip
ifeq ($(CONFIG_NET_TULIP),y)
obj-y += tulip/tulip_net.o
endif
subdir-$(CONFIG_HAMRADIO) += hamradio
ifeq ($(CONFIG_HAMRADIO),y)
obj-y += hamradio/hamradio.o
endif
subdir-$(CONFIG_IRDA) += irda
ifeq ($(CONFIG_IRDA),y)
obj-y += irda/irda.o
endif
include $(TOPDIR)/Rules.make
clean:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment