Commit b3e20e41 authored by Linus Torvalds's avatar Linus Torvalds

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 54de58e9 0bb436c2
......@@ -162,8 +162,6 @@ objtree := $(TOPDIR)
export srctree objtree
SUBDIRS := init kernel mm fs ipc lib drivers sound net security
# The temporary file to save gcc -MD generated dependencies must not
# contain a comma
depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
......@@ -246,15 +244,35 @@ endif
# Link components for vmlinux
# ---------------------------------------------------------------------------
INIT := init/init.o
CORE_FILES := kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o security/built-in.o
LIBS := lib/lib.a
DRIVERS := drivers/built-in.o sound/sound.o
NETWORKS := net/network.o
init-y := init/
drivers-y := drivers/ sound/
networks-y := net/
libs-y := lib/
CORE_FILES := kernel/built-in.o mm/built-in.o fs/built-in.o \
ipc/built-in.o security/built-in.o
SUBDIRS += kernel mm fs ipc security
include arch/$(ARCH)/Makefile
export NETWORKS DRIVERS LIBS HEAD LDFLAGS MAKEBOOT ASFLAGS
SUBDIRS += $(patsubst %/,%,$(filter %/, $(init-y) $(init-m)))
INIT += $(patsubst %/, %/built-in.o, $(init-y))
SUBDIRS += $(patsubst %/,%,$(filter %/, $(core-y) $(core-m)))
CORE_FILES := $(patsubst %/, %/built-in.o, $(core-y)) $(CORE_FILES)
SUBDIRS += $(patsubst %/,%,$(filter %/, $(drivers-y) $(drivers-m)))
DRIVERS += $(patsubst %/, %/built-in.o, $(drivers-y))
SUBDIRS += $(patsubst %/,%,$(filter %/, $(networks-y) $(networks-m)))
NETWORKS += $(patsubst %/, %/built-in.o, $(networks-y))
SUBDIRS += $(patsubst %/,%,$(filter %/, $(libs-y) $(libs-m)))
LIBS += $(patsubst %/, %/lib.a, $(libs-y))
$(warning $(SUBDIRS))
export NETWORKS DRIVERS LIBS HEAD LDFLAGS MAKEBOOT
# boot target
# ---------------------------------------------------------------------------
......
......@@ -87,20 +87,12 @@ endif
HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
SUBDIRS += arch/i386/kernel arch/i386/mm arch/i386/lib
libs-y += arch/i386/lib/
CORE_FILES := arch/i386/kernel/kernel.o arch/i386/mm/mm.o $(CORE_FILES)
LIBS := $(TOPDIR)/arch/i386/lib/lib.a $(LIBS) $(TOPDIR)/arch/i386/lib/lib.a
core-y += arch/i386/kernel/ arch/i386/mm/
ifdef CONFIG_MATH_EMULATION
SUBDIRS += arch/i386/math-emu
DRIVERS += arch/i386/math-emu/math.o
endif
ifdef CONFIG_PCI
SUBDIRS += arch/i386/pci
DRIVERS += arch/i386/pci/pci.o
endif
drivers-$(CONFIG_MATH_EMULATION) += arch/i386/math-emu/
drivers-$(CONFIG_PCI) += arch/i386/pci/
MAKEBOOT = +$(MAKE) -C arch/$(ARCH)/boot
......
......@@ -2,9 +2,7 @@
# Makefile for the linux kernel.
#
EXTRA_TARGETS := kernel.o head.o init_task.o
O_TARGET := kernel.o
EXTRA_TARGETS := head.o init_task.o
export-objs := mca.o i386_ksyms.o time.o
......
......@@ -2,8 +2,6 @@
# Makefile for wm-FPU-emu
#
O_TARGET := math.o
#DEBUG = -DDEBUGGING
DEBUG =
PARANOID = -DPARANOID
......
#
# Makefile for the linux i386-specific parts of the memory manager.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := mm.o
export-objs := pageattr.o
obj-y := init.o pgtable.o fault.o ioremap.o extable.o pageattr.o
obj-y := init.o pgtable.o fault.o ioremap.o extable.o pageattr.o
obj-$(CONFIG_DISCONTIGMEM) += discontig.o
export-objs := pageattr.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
include $(TOPDIR)/Rules.make
O_TARGET := pci.o
obj-y := i386.o
ifdef CONFIG_VISWS
......
......@@ -112,7 +112,7 @@ endif
ifdef CONFIG_DECSTATION
CORE_FILES += arch/mips/dec/dec.o
SUBDIRS += arch/mips/dec arch/mips/dec/prom
LIBS += arch/mips/dec/prom/rexlib.a
LIBS += arch/mips/dec/prom/lib.a
LOADADDR += 0x80040000
endif
......@@ -134,20 +134,20 @@ endif
ifdef CONFIG_MIPS_JAZZ
CORE_FILES += arch/mips/jazz/jazz.o
SUBDIRS += arch/mips/jazz arch/mips/arc
LIBS += arch/mips/arc/arclib.a
LIBS += arch/mips/arc/lib.a
LOADADDR += 0x80080000
endif
ifdef CONFIG_SNI_RM200_PCI
CORE_FILES += arch/mips/sni/sni.o
SUBDIRS += arch/mips/sni arch/mips/arc
LIBS += arch/mips/arc/arclib.a
LIBS += arch/mips/arc/lib.a
LOADADDR += 0x80080000
endif
ifdef CONFIG_SGI_IP22
CORE_FILES += arch/mips/sgi/kernel/ip22-kern.o
LIBS += arch/mips/arc/arclib.a
LIBS += arch/mips/arc/lib.a
SUBDIRS += arch/mips/sgi/kernel arch/mips/arc
#
# Set LOADADDR to >= 0x88069000 if you want to leave space for symmon,
......@@ -162,7 +162,7 @@ endif
#
ifdef CONFIG_BAGET_MIPS
SUBDIRS += arch/mips/baget arch/mips/baget/prom
LIBS += arch/mips/baget/baget.a arch/mips/baget/prom/bagetlib.a
LIBS += arch/mips/baget/baget.a arch/mips/baget/prom/lib.a
LOADADDR += 0x80001000
endif
......
......@@ -2,13 +2,8 @@
# Makefile for the SGI arcs prom monitor library routines
# under Linux.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now in the main makefile...
L_TARGET = arclib.a
L_TARGET = lib.a
obj-y += console.o init.o memory.o tree.o env.o cmdline.o misc.o \
time.o file.o identify.o
......
#
# Makefile for the Baget/MIPS prom emulator library routines.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now in the main makefile...
L_TARGET := bagetlib.a
L_TARGET := lib.a
obj-y := init.o
......
......@@ -3,7 +3,7 @@
# under Linux.
#
L_TARGET := rexlib.a
L_TARGET := lib.a
obj-y := init.o memory.o cmdline.o identify.o locore.o
......
......@@ -72,7 +72,7 @@ endif
# Board-dependent options and extra files
#
ifdef CONFIG_SGI_IP22
LIBS += arch/mips64/sgi-ip22/ip22.a arch/mips64/arc/arclib.a
LIBS += arch/mips64/sgi-ip22/lib.a arch/mips64/arc/lib.a
SUBDIRS += arch/mips64/sgi-ip22 arch/mips64/arc
#
# Set LOADADDR to >= 0x88069000 if you want to leave space for symmon,
......@@ -84,7 +84,7 @@ endif
ifdef CONFIG_SGI_IP27
CORE_FILES += arch/mips64/sgi-ip27/ip27.o
LIBS += arch/mips64/arc/arclib.a
LIBS += arch/mips64/arc/lib.a
SUBDIRS += arch/mips64/sgi-ip27 arch/mips64/arc
#
# Set LOADADDR to >= 0xc000000000300000 if you want to leave space for
......@@ -100,7 +100,7 @@ endif
endif
ifdef CONFIG_SGI_IP32
LIBS += arch/mips64/sgi-ip32/ip32-kern.a arch/mips64/arc/arclib.a
LIBS += arch/mips64/sgi-ip32/ip32-kern.a arch/mips64/arc/lib.a
SUBDIRS += arch/mips64/sgi-ip32 arch/mips64/arc
#
# Set LOADADDR to >= 0x????????? if you want to leave space for symmon,
......
......@@ -2,7 +2,7 @@
# Makefile for the ARC prom monitor library routines under Linux.
#
L_TARGET = arclib.a
L_TARGET = lib.a
obj-y := console.o init.o identify.o tree.o env.o cmdline.o misc.o time.o \
file.o
......
......@@ -5,7 +5,7 @@
EXTRA_AFLAGS := $(CFLAGS)
L_TARGET = ip22.a
L_TARGET = lib.a
obj-y += ip22-berr.o ip22-mc.o ip22-sc.o ip22-hpc.o ip22-int.o ip22-rtc.o \
ip22-setup.o system.o ip22-timer.o ip22-irq.o ip22-reset.o time.o
......
......@@ -19,7 +19,7 @@ OBJCOPY_ARGS = -O elf32-powerpc
MKIMAGE := ./utils/mkimage.wrapper
lib/zlib.a: lib/zlib.c
lib/lib.a: lib/zlib.c
$(MAKE) -C lib
images/vmlinux.gz: $(TOPDIR)/vmlinux
......@@ -55,7 +55,7 @@ maketools:
# The targets all boards support for boot images.
BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd
$(BOOT_TARGETS): vmapus lib/zlib.a images/vmlinux.gz maketools
$(BOOT_TARGETS): vmapus lib/lib.a images/vmlinux.gz maketools
ifneq ($(BOOTDIRS),)
for d in $(BOOTDIRS); do $(MAKE) -C $$d $@; done
endif
......
......@@ -2,7 +2,7 @@
# Makefile for some libs needed by zImage.
#
L_TARGET := zlib.a
L_TARGET := lib.a
obj-y := zlib.o
......
......@@ -40,7 +40,7 @@ SUBDIRS += arch/sparc/kernel arch/sparc/lib arch/sparc/prom \
CORE_FILES := arch/sparc/kernel/kernel.o arch/sparc/mm/mm.o $(CORE_FILES) \
arch/sparc/math-emu/math-emu.o
LIBS := $(LIBS) arch/sparc/prom/promlib.a arch/sparc/lib/lib.a
LIBS := $(LIBS) arch/sparc/prom/lib.a arch/sparc/lib/lib.a
# This one has to come last
SUBDIRS += arch/sparc/boot
......
......@@ -2,13 +2,8 @@
# Makefile for the Sun Boot PROM interface library under
# Linux.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now in the main makefile...
L_TARGET = promlib.a
L_TARGET = lib.a
obj-y := bootstr.o devmap.o devops.o init.o memory.o misc.o mp.o \
palloc.o ranges.o segment.o console.o printf.o tree.o
......
......@@ -72,7 +72,7 @@ endif
CORE_FILES += arch/sparc64/math-emu/math-emu.o
LIBS := $(TOPDIR)/lib/lib.a $(LIBS) $(TOPDIR)/arch/sparc64/prom/promlib.a \
LIBS := $(TOPDIR)/lib/lib.a $(LIBS) $(TOPDIR)/arch/sparc64/prom/lib.a \
$(TOPDIR)/arch/sparc64/lib/lib.a
vmlinux.aout: vmlinux
......
......@@ -5,7 +5,7 @@
EXTRA_AFLAGS := -ansi
L_TARGET = promlib.a
L_TARGET = lib.a
obj-y := bootstr.o devops.o init.o memory.o misc.o \
tree.o console.o printf.o p1275.o map.o
......
......@@ -9,18 +9,8 @@
#
export-objs := ide-iops.o ide-taskfile.o ide-proc.o ide.o ide-probe.o ide-dma.o ide-lib.o setup-pci.o
all-subdirs := arm legacy pci ppc
mod-subdirs := arm legacy pci ppc
obj-y :=
obj-m :=
ide-obj-y :=
subdir-$(CONFIG_BLK_DEV_IDEPCI) += pci
subdir-$(CONFIG_BLK_DEV_IDE) += legacy ppc arm pci
# First come modules that register themselves with the core
obj-y += pci/idedriver-pci.o
obj-$(CONFIG_BLK_DEV_IDEPCI) += pci/
# Core IDE code - must come before legacy
......@@ -35,13 +25,9 @@ obj-$(CONFIG_BLK_DEV_IDEDMA_PCI) += ide-dma.o
obj-$(CONFIG_BLK_DEV_ISAPNP) += ide-pnp.o
ifeq ($(CONFIG_BLK_DEV_IDE),y)
obj-$(CONFIG_PROC_FS) += ide-proc.o
obj-$(CONFIG_PROC_FS) += ide-proc.o
endif
ifeq ($(CONFIG_BLK_DEV_IDE),y)
obj-y += legacy/idedriver-legacy.o
obj-y += ppc/idedriver-ppc.o
obj-y += arm/idedriver-arm.o
endif
obj-$(CONFIG_BLK_DEV_IDE) += legacy/ ppc/ arm/
include $(TOPDIR)/Rules.make
O_TARGET := idedriver-arm.o
obj-y :=
obj-m :=
obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o
obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o
......
O_TARGET := idedriver-legacy.o
obj-y :=
obj-m :=
obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o
obj-$(CONFIG_BLK_DEV_DTC2278) += dtc2278.o
obj-$(CONFIG_BLK_DEV_HT6560B) += ht6560b.o
......
O_TARGET := idedriver-pci.o
obj-y :=
obj-m :=
obj-$(CONFIG_BLK_DEV_ADMA100) += adma100.o
obj-$(CONFIG_BLK_DEV_AEC62XX) += aec62xx.o
obj-$(CONFIG_BLK_DEV_ALI15X3) += alim15x3.o
......
O_TARGET := idedriver-ppc.o
obj-y :=
obj-m :=
obj-$(CONFIG_BLK_DEV_MPC8xx_IDE) += mpc8xx.o
obj-$(CONFIG_BLK_DEV_IDE_PMAC) += pmac.o
obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o
......
......@@ -2,11 +2,8 @@
# Makefile for the Linux IEEE 1394 implementation
#
O_TARGET := ieee1394drv.o
export-objs := ieee1394_core.o ohci1394.o cmp.o
list-multi := ieee1394.o
ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \
highlevel.o csr.o nodemgr.o
......@@ -22,6 +19,3 @@ obj-$(CONFIG_IEEE1394_AMDTP) += amdtp.o
obj-$(CONFIG_IEEE1394_CMP) += cmp.o
include $(TOPDIR)/Rules.make
ieee1394.o: $(ieee1394-objs)
$(LD) $(LDFLAGS) -r -o $@ $(ieee1394-objs)
......@@ -59,7 +59,7 @@ static LIST_HEAD(adapter_list);
* This function will be called when the adapter is plugged
* into the USB bus.
*/
static int probe_st5481(struct usb_interface *intf
static int probe_st5481(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct usb_device *dev = interface_to_usbdev(intf);
......@@ -115,7 +115,7 @@ static int probe_st5481(struct usb_interface *intf
st5481_start(adapter);
dev_set_drvdata(&intf->dev, adapter);
return adapter;
return 0;
err_b:
st5481_release_b(&adapter->bcs[0]);
......
#
# Makefile for the LSI Logic Fusion MPT (Message Passing Technology) drivers.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definition is now inherited from the
# parent makefile.
#
# Note 3! If you want to turn on various debug defines for an extended period of
# Note! If you want to turn on various debug defines for an extended period of
# time but don't want them lingering around in the Makefile when you pass it on
# to someone else, use the MPT_CFLAGS env variable (thanks Steve). -nromer
......@@ -53,27 +46,11 @@ EXTRA_CFLAGS += -I. ${MPT_CFLAGS}
#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
O_TARGET := fusion.o
export-objs := mptbase.o mptscsih.o mptlan.o mptctl.o isense.o
# ? what's list-multi for?
#list-multi := fusion.o mptscsih.o
obj-$(CONFIG_FUSION) += mptbase.o mptscsih.o
obj-$(CONFIG_FUSION_ISENSE) += isense.o
obj-$(CONFIG_FUSION_CTL) += mptctl.o
obj-$(CONFIG_FUSION_LAN) += mptlan.o
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)))
include $(TOPDIR)/Rules.make
# EXP...
## Fusion MPT extra's...
##mptscsih.o: $(mptscsih-objs)
## $(LD) -r -o $@ $(mptscsih-objs)
......@@ -5,8 +5,6 @@
# Rewritten to use lists instead of if-statements.
#
O_TARGET := fs.o
export-objs := open.o dcache.o buffer.o bio.o inode.o dquot.o mpage.o aio.o \
fcntl.o
......
......@@ -2,8 +2,6 @@
# Makefile for the linux kernel.
#
O_TARGET := init.o
obj-y := main.o version.o do_mounts.o
include $(TOPDIR)/Rules.make
......
#
# Makefile for the linux ipc.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := ipc.o
obj-y := util.o
......
#
# Makefile for the linux kernel.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := kernel.o
export-objs = signal.o sys.o kmod.o context.o ksyms.o pm.o exec_domain.o \
printk.o platform.o suspend.o dma.o
......
#
# Makefile for the linux memory manager.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := mm.o
export-objs := shmem.o filemap.o mempool.o page_alloc.o \
page-writeback.o
......
......@@ -5,9 +5,6 @@
# Rewritten to use lists instead of if-statements.
#
O_TARGET := network.o
export-objs := netsyms.o
obj-y := socket.o core/
......
# Makefile for the Linux sound card driver
#
O_TARGET := sound.o
export-objs := sound_core.o
obj-$(CONFIG_SOUND) += soundcore.o
......
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