Commit f67c77ff authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-isdn.bkbits.net/linux-2.5.make

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents f8f0a287 e4388f37
...@@ -99,15 +99,15 @@ This document is aimed towards normal developers and arch developers. ...@@ -99,15 +99,15 @@ This document is aimed towards normal developers and arch developers.
=== 3 Makefile language === 3 Makefile language
The kernel Makefiles are designed to run with Gnu Make. The Makefiles The kernel Makefiles are designed to run with GNU Make. The Makefiles
use only the documented features of Gnu Make, but they do use many use only the documented features of GNU Make, but they do use many
Gnu extensions. GNU extensions.
Gnu Make supports elementary list-processing functions. The kernel GNU Make supports elementary list-processing functions. The kernel
Makefiles use a novel style of list building and manipulation with few Makefiles use a novel style of list building and manipulation with few
"if" statements. "if" statements.
Gnu Make has two assignment operators, ":=" and "=". ":=" performs GNU Make has two assignment operators, ":=" and "=". ":=" performs
immediate evaluation of the right-hand side and stores an actual string immediate evaluation of the right-hand side and stores an actual string
into the left-hand side. "=" is like a formula definition; it stores the into the left-hand side. "=" is like a formula definition; it stores the
right-hand side in an unevaluated form and then evaluates this form each right-hand side in an unevaluated form and then evaluates this form each
...@@ -191,7 +191,7 @@ The top Makefile exports the following variables: ...@@ -191,7 +191,7 @@ The top Makefile exports the following variables:
$(DRIVERS), and $(LIBS). The arch Makefile defines $(HEAD) $(DRIVERS), and $(LIBS). The arch Makefile defines $(HEAD)
and $(LINKFLAGS), and extends $(CORE_FILES) and $(LIBS). and $(LINKFLAGS), and extends $(CORE_FILES) and $(LIBS).
Note: there are more names here than necessary. $(NETWORKS), Note: there are more variables here than necessary. $(NETWORKS),
$(DRIVERS), and even $(LIBS) could be subsumed into $(CORE_FILES). $(DRIVERS), and even $(LIBS) could be subsumed into $(CORE_FILES).
CPP, CC, AS, LD, AR, NM, STRIP, OBJCOPY, OBJDUMP CPP, CC, AS, LD, AR, NM, STRIP, OBJCOPY, OBJDUMP
...@@ -289,12 +289,12 @@ The top Makefile exports the following variables: ...@@ -289,12 +289,12 @@ The top Makefile exports the following variables:
MAKE, MAKEFILES MAKE, MAKEFILES
Some variables internal to Gnu Make. Some variables internal to GNU Make.
$(MAKEFILES) in particular is used to force the arch Makefiles $(MAKEFILES) in particular is used to force the arch Makefiles
and subdirectory Makefiles to read $(TOPDIR)/.config without and subdirectory Makefiles to read $(TOPDIR)/.config without
including it explicitly. (This was an implementation hack and including it explicitly. (This was an implementational hack
could be fixed). and could be fixed).
...@@ -338,7 +338,7 @@ architecture-specific values. ...@@ -338,7 +338,7 @@ architecture-specific values.
extends them. extends them.
Many arch Makefiles dynamically run the target C compiler to Many arch Makefiles dynamically run the target C compiler to
probe what options it supports: probe supported options:
# arch/i386/Makefile # arch/i386/Makefile
...@@ -375,7 +375,7 @@ architecture-specific values. ...@@ -375,7 +375,7 @@ architecture-specific values.
--- 5.2 Vmlinux build variables --- 5.2 Vmlinux build variables
An arch Makefile co-operates with the top Makefile to define variables An arch Makefile cooperates with the top Makefile to define variables
which specify how to build the vmlinux file. Note that there is no which specify how to build the vmlinux file. Note that there is no
corresponding arch-specific section for modules; the module-building corresponding arch-specific section for modules; the module-building
machinery is all architecture-independent. machinery is all architecture-independent.
...@@ -471,11 +471,9 @@ A subdirectory Makefile has four sections. ...@@ -471,11 +471,9 @@ A subdirectory Makefile has four sections.
--- 6.1 Comments --- 6.1 Comments
The first section is a comment header. Just write what you would The first section is a comment header. Historically, many anonymous
write if you were editing a C source file, but use "# ..." instead of people have edited kernel Makefiles without leaving any change
"/* ... */". Historically, many anonymous people have edited kernel histories in the header; comments from them would have been valuable.
Makefiles without leaving any change histories in the header; comments
from them would have been valuable.
...@@ -657,8 +655,8 @@ $(subdir-y), not $(subdir-m). ...@@ -657,8 +655,8 @@ $(subdir-y), not $(subdir-m).
export-objs export-objs
When using loadable modules, not every global symbol in the When using loadable modules, not every global symbol in the
kernel / other modules is automatically available for your kernel / other modules is automatically available, only those
module, only those explicitly exported are. explicitly exported are available for your module.
To make a symbol available for use in modules, to "export" it, To make a symbol available for use in modules, to "export" it,
use the EXPORT_SYMBOL(<symbol>) directive in your source. In use the EXPORT_SYMBOL(<symbol>) directive in your source. In
...@@ -827,7 +825,7 @@ people define most variables using "new style" but then fall back to ...@@ -827,7 +825,7 @@ people define most variables using "new style" but then fall back to
obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o
Notice the use of $(CONFIG_...) substitutions on the left hand Notice the use of $(CONFIG_...) substitutions on the left hand
side of an assignment operator. This gives Gnu Make the power side of an assignment operator. This gives GNU Make the power
of associative indexing! Each of these assignments replaces of associative indexing! Each of these assignments replaces
eight lines of code in an old-style Makefile. eight lines of code in an old-style Makefile.
...@@ -840,9 +838,8 @@ people define most variables using "new style" but then fall back to ...@@ -840,9 +838,8 @@ people define most variables using "new style" but then fall back to
$(obj-n) and $(obj-) are ignored. $(obj-n) and $(obj-) are ignored.
Each list may contain duplicates items; duplicates are Each list may contain duplicates items; duplicates are
automatically removed later. Also, if a file appears in both automatically removed later. Duplicates in both $(obj-y) and
$(obj-y) and $(obj-m), it will automatically be removed from $(obj-m) will automatically be removed from the $(obj-m) list.
the $(obj-m) list.
Example: Example:
...@@ -926,9 +923,9 @@ people define most variables using "new style" but then fall back to ...@@ -926,9 +923,9 @@ people define most variables using "new style" but then fall back to
of sr_mod.o will be linked together with "$(LD) -r" to make the of sr_mod.o will be linked together with "$(LD) -r" to make the
kernel module sr_mod.o. kernel module sr_mod.o.
And suppose CONFIG_SCSI_INITIO=n. Then initio.o goes onto the Also suppose CONFIG_SCSI_INITIO=n. Then initio.o goes onto
$(obj-n) list and that's the end of it. Its component files the $(obj-n) list and that's the end of it. Its component
are not compiled, and the composite file is not created. files are not compiled, and the composite file is not created.
subdir-y subdir-m subdir-n subdir- subdir-y subdir-m subdir-n subdir-
...@@ -947,9 +944,9 @@ people define most variables using "new style" but then fall back to ...@@ -947,9 +944,9 @@ people define most variables using "new style" but then fall back to
These variables work similar to obj-*, but are used for These variables work similar to obj-*, but are used for
subdirectories instead of object files. subdirectories instead of object files.
After executing all of the assignments, the subdirectory After executing all assignments, the subdirectory Makefile has
Makefile has built up four lists: $(subdir-y), $(subdir-m), built up four lists: $(subdir-y), $(subdir-m), $(subdir-n),
$(subdir-n), and $(subdir-). and $(subdir-).
$(subdir-y) is a list of directories that should be entered $(subdir-y) is a list of directories that should be entered
for making vmlinux. for making vmlinux.
......
...@@ -140,11 +140,6 @@ DRIVERS-y += drivers/base/base.o \ ...@@ -140,11 +140,6 @@ DRIVERS-y += drivers/base/base.o \
DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a 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_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
...@@ -160,9 +155,6 @@ DRIVERS-$(CONFIG_SOUND) += sound/sound.o ...@@ -160,9 +155,6 @@ DRIVERS-$(CONFIG_SOUND) += sound/sound.o
DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.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_PCMCIA_CHRDEV) += drivers/char/pcmcia/pcmcia_char.o
DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
...@@ -173,14 +165,12 @@ DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o ...@@ -173,14 +165,12 @@ DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
DRIVERS-$(CONFIG_VT) += drivers/video/video.o DRIVERS-$(CONFIG_VT) += drivers/video/video.o
DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a 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_TC) += drivers/tc/tc.a
DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.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_I2C) += drivers/i2c/i2c.o
DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
......
...@@ -43,9 +43,6 @@ subdir-$(CONFIG_PNP) += pnp ...@@ -43,9 +43,6 @@ subdir-$(CONFIG_PNP) += pnp
subdir-$(CONFIG_ISDN) += isdn subdir-$(CONFIG_ISDN) += isdn
subdir-$(CONFIG_ATM) += atm subdir-$(CONFIG_ATM) += atm
subdir-$(CONFIG_FC4) += fc4 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_I2C) += i2c
subdir-$(CONFIG_ACPI) += acpi subdir-$(CONFIG_ACPI) += acpi
......
...@@ -8,7 +8,8 @@ obj-m := ...@@ -8,7 +8,8 @@ obj-m :=
obj-n := obj-n :=
obj- := obj- :=
mod-subdirs := appletalk arcnet fc irda tokenring tulip pcmcia wireless wan mod-subdirs := appletalk arcnet fc irda tokenring tulip pcmcia wireless \
wan ../acorn/net
O_TARGET := net.o O_TARGET := net.o
...@@ -20,30 +21,22 @@ export-objs := 8390.o arlan.o aironet4500_core.o aironet4500_card.o \ ...@@ -20,30 +21,22 @@ export-objs := 8390.o arlan.o aironet4500_core.o aironet4500_card.o \
net_init.o mii.o net_init.o mii.o
rcpci-objs := rcpci45.o rclanmtl.o rcpci-objs := rcpci45.o rclanmtl.o
ifeq ($(CONFIG_E100),y)
obj-y += e100/e100.o
endif
ifeq ($(CONFIG_E1000),y)
obj-y += e1000/e1000.o
endif
ifeq ($(CONFIG_ISDN_PPP),y) ifeq ($(CONFIG_ISDN_PPP),y)
obj-$(CONFIG_ISDN) += slhc.o obj-$(CONFIG_ISDN) += slhc.o
endif endif
subdir-$(CONFIG_NET_PCMCIA) += pcmcia subdir-$(CONFIG_NET_PCMCIA) += pcmcia
subdir-$(CONFIG_NET_WIRELESS) += wireless subdir-$(CONFIG_NET_WIRELESS) += wireless
subdir-$(CONFIG_NET_TULIP) += tulip
subdir-$(CONFIG_E100) += e100 subdir-$(CONFIG_E100) += e100
ifeq ($(CONFIG_E100),y)
obj-y += e100/e100.o
endif
subdir-$(CONFIG_E1000) += e1000 subdir-$(CONFIG_E1000) += e1000
subdir-$(CONFIG_IRDA) += irda ifeq ($(CONFIG_E1000),y)
subdir-$(CONFIG_TR) += tokenring obj-y += e1000/e1000.o
subdir-$(CONFIG_WAN) += wan endif
subdir-$(CONFIG_NET_FC) += fc
subdir-$(CONFIG_ARCNET) += arcnet
subdir-$(CONFIG_DEV_APPLETALK) += appletalk
subdir-$(CONFIG_SK98LIN) += sk98lin
subdir-$(CONFIG_SKFP) += skfp
# #
# link order important here # link order important here
...@@ -83,10 +76,12 @@ obj-$(CONFIG_FEALNX) += fealnx.o mii.o ...@@ -83,10 +76,12 @@ obj-$(CONFIG_FEALNX) += fealnx.o mii.o
obj-$(CONFIG_TIGON3) += tg3.o obj-$(CONFIG_TIGON3) += tg3.o
obj-$(CONFIG_TC35815) += tc35815.o obj-$(CONFIG_TC35815) += tc35815.o
subdir-$(CONFIG_SK98LIN) += sk98lin
ifeq ($(CONFIG_SK98LIN),y) ifeq ($(CONFIG_SK98LIN),y)
obj-y += sk98lin/sk98lin.o obj-y += sk98lin/sk98lin.o
endif endif
subdir-$(CONFIG_SKFP) += skfp
ifeq ($(CONFIG_SKFP),y) ifeq ($(CONFIG_SKFP),y)
obj-y += skfp/skfp.o obj-y += skfp/skfp.o
endif endif
...@@ -215,10 +210,59 @@ obj-$(CONFIG_MAC89x0) += mac89x0.o ...@@ -215,10 +210,59 @@ obj-$(CONFIG_MAC89x0) += mac89x0.o
obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_DL2K) += dl2k.o obj-$(CONFIG_DL2K) += dl2k.o
subdir-$(CONFIG_ARCH_ACORN) += ../acorn/net
ifeq ($(CONFIG_ARCH_ACORN),y) ifeq ($(CONFIG_ARCH_ACORN),y)
mod-subdirs += ../acorn/net obj-y += ../acorn/net/acorn-net.o
subdir-y += ../acorn/net endif
obj-y += ../acorn/net/acorn-net.o
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 endif
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
......
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