Commit 70d7ae38 authored by Kai Germaschewski's avatar Kai Germaschewski

Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-fix
parents ff42067b 62df53d4
...@@ -6,7 +6,7 @@ EXTRA_TARGETS := kernel.o head.o init_task.o ...@@ -6,7 +6,7 @@ EXTRA_TARGETS := kernel.o head.o init_task.o
O_TARGET := kernel.o O_TARGET := kernel.o
export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o export-objs := mca.o mtrr.o i386_ksyms.o time.o
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \ ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
L_TARGET = lib.a L_TARGET = lib.a
export-objs := io.o swiotlb.o export-objs := swiotlb.o
obj-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \ obj-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \
__divdi3.o __udivdi3.o __moddi3.o __umoddi3.o \ __divdi3.o __udivdi3.o __moddi3.o __umoddi3.o \
......
...@@ -18,7 +18,7 @@ EXTRA_CFLAGS := -DLITTLE_ENDIAN ...@@ -18,7 +18,7 @@ EXTRA_CFLAGS := -DLITTLE_ENDIAN
O_TARGET := sgiio.o O_TARGET := sgiio.o
ifeq ($(CONFIG_MODULES),y) ifeq ($(CONFIG_MODULES),y)
export-objs = pciio.o hcl.o pci_dma.o export-objs = pciio.o hcl.o
endif endif
obj-y := stubs.o sgi_if.o pciio.o xtalk.o xbow.o xswitch.o klgraph_hack.o \ obj-y := stubs.o sgi_if.o pciio.o xtalk.o xbow.o xswitch.o klgraph_hack.o \
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
O_TARGET := baget.a O_TARGET := baget.a
export-objs := vacserial.o vacrtc.o export-objs := vacserial.o
obj-y := baget.o print.o setup.o time.o irq.o bagetIRQ.o \ obj-y := baget.o print.o setup.o time.o irq.o bagetIRQ.o \
reset.o wbflush.o reset.o wbflush.o
obj-$(CONFIG_SERIAL) += vacserial.o obj-$(CONFIG_SERIAL) += vacserial.o
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
O_TARGET := kernel.o O_TARGET := kernel.o
EXTRA_TARGETS := head.o init_task.o EXTRA_TARGETS := head.o init_task.o
export-objs := mips_ksyms.o
obj-y += branch.o process.o signal.o entry.o \ obj-y += branch.o process.o signal.o entry.o \
traps.o ptrace.o vm86.o ioport.o reset.o \ traps.o ptrace.o vm86.o ioport.o reset.o \
...@@ -27,14 +28,12 @@ endif ...@@ -27,14 +28,12 @@ endif
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o
# Old style irq support, going to die in 2.5. # Old style irq support, going to die in 2.5.
export-objs += old-irq.o
obj-$(CONFIG_NEW_IRQ) += irq.o obj-$(CONFIG_NEW_IRQ) += irq.o
obj-$(CONFIG_ROTTEN_IRQ) += old-irq.o obj-$(CONFIG_ROTTEN_IRQ) += old-irq.o
obj-$(CONFIG_I8259) += i8259.o obj-$(CONFIG_I8259) += i8259.o
# transition from old time.c to new time.c # transition from old time.c to new time.c
# some boards uses old-time.c, some use time.c, and some use their own ones # some boards uses old-time.c, some use time.c, and some use their own ones
export-objs += old-time.o time.o
obj-$(CONFIG_OLD_TIME_C) += old-time.o obj-$(CONFIG_OLD_TIME_C) += old-time.o
obj-$(CONFIG_NEW_TIME_C) += time.o obj-$(CONFIG_NEW_TIME_C) += time.o
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
O_TARGET := 8xx_io.o O_TARGET := 8xx_io.o
export-objs := fec.o
obj-y := commproc.o uart.o obj-y := commproc.o uart.o
obj-$(CONFIG_FEC_ENET) += fec.o obj-$(CONFIG_FEC_ENET) += fec.o
......
...@@ -9,7 +9,7 @@ KHEAD := head.o ...@@ -9,7 +9,7 @@ KHEAD := head.o
O_TARGET := kernel.o O_TARGET := kernel.o
EXTRA_TARGETS := $(KHEAD) EXTRA_TARGETS := $(KHEAD)
export-objs := ppc_ksyms.o setup.o export-objs := ppc_ksyms.o
obj-y := ppc_ksyms.o setup.o entry.o traps.o irq.o idle.o \ obj-y := ppc_ksyms.o setup.o entry.o traps.o irq.o idle.o \
time.o process.o signal.o syscalls.o misc.o ptrace.o \ time.o process.o signal.o syscalls.o misc.o ptrace.o \
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
O_TARGET := kernel.o O_TARGET := kernel.o
EXTRA_TARGETS := head.o init_task.o EXTRA_TARGETS := head.o init_task.o
export-objs := io.o io_generic.o io_hd64461.o setup_hd64461.o sh_ksyms.o export-objs := io.o io_generic.o io_hd64465.o setup_hd64465.o sh_ksyms.o \
io_adx.o io_bigsur.o io_cat68701.o hd64465_gpio.o
obj-y := process.o signal.o entry.o traps.o irq.o irq_ipr.o \ obj-y := process.o signal.o entry.o traps.o irq.o irq_ipr.o \
ptrace.o setup.o time.o sys_sh.o semaphore.o \ ptrace.o setup.o time.o sys_sh.o semaphore.o \
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
O_TARGET := kernel.o O_TARGET := kernel.o
EXTRA_TARGETS := head.o head64.o init_task.o EXTRA_TARGETS := head.o head64.o init_task.o
export-objs := mtrr.o msr.o cpuid.o x8664_ksyms.o export-objs := mtrr.o x8664_ksyms.o
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.o \ ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.o \
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# #
# All the objects that export symbols. # All the objects that export symbols.
export-objs := mouse_rpc.o
obj-arc := keyb_arc.o obj-arc := keyb_arc.o
obj-rpc := keyb_ps2.o obj-rpc := keyb_ps2.o
obj-clps7500 := keyb_ps2.o defkeymap-acorn.o obj-clps7500 := keyb_ps2.o defkeymap-acorn.o
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
# In the future, some of these should be built conditionally. # In the future, some of these should be built conditionally.
# #
export-objs := elevator.o ll_rw_blk.o blkpg.o loop.o DAC960.o genhd.o block_ioctl.o export-objs := elevator.o ll_rw_blk.o blkpg.o loop.o genhd.o \
block_ioctl.o acsi.o
obj-y := elevator.o ll_rw_blk.o blkpg.o genhd.o block_ioctl.o obj-y := elevator.o ll_rw_blk.o blkpg.o genhd.o block_ioctl.o
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Objects that export symbols. # Objects that export symbols.
export-objs := adb.o rtc.o mac_hid.o via-pmu.o export-objs := adb.o mac_hid.o via-pmu.o
# Object file lists. # Object file lists.
......
...@@ -43,7 +43,7 @@ EXTRA_CFLAGS += -I. ${MPT_CFLAGS} ...@@ -43,7 +43,7 @@ EXTRA_CFLAGS += -I. ${MPT_CFLAGS}
#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
export-objs := mptbase.o mptscsih.o mptlan.o mptctl.o isense.o export-objs := mptbase.o
obj-$(CONFIG_FUSION) += mptbase.o mptscsih.o obj-$(CONFIG_FUSION) += mptbase.o mptscsih.o
obj-$(CONFIG_FUSION_ISENSE) += isense.o obj-$(CONFIG_FUSION_ISENSE) += isense.o
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# #
export-objs := z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o \ export-objs := z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o \
dlci.o pc300_drv.o dlci.o
wanpipe-y := sdlamain.o sdla_ft1.o wanpipe-y := sdlamain.o sdla_ft1.o
wanpipe-$(CONFIG_WANPIPE_X25) += sdla_x25.o wanpipe-$(CONFIG_WANPIPE_X25) += sdla_x25.o
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the kernel pcmcia subsystem (c/o David Hinds) # Makefile for the kernel pcmcia subsystem (c/o David Hinds)
# #
export-objs := ds.o cs.o yenta.o pci_socket.o export-objs := ds.o cs.o yenta.o
obj-$(CONFIG_PCMCIA) += pcmcia_core.o ds.o obj-$(CONFIG_PCMCIA) += pcmcia_core.o ds.o
ifeq ($(CONFIG_CARDBUS),y) ifeq ($(CONFIG_CARDBUS),y)
......
...@@ -8,6 +8,6 @@ obj-y += airq.o blacklist.o cio.o ioinfo.o misc.o requestirq.o s390io.o ...@@ -8,6 +8,6 @@ obj-y += airq.o blacklist.o cio.o ioinfo.o misc.o requestirq.o s390io.o
obj-$(CONFIG_CHSC) += chsc.o obj-$(CONFIG_CHSC) += chsc.o
obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_PROC_FS) += proc.o
export-objs += airq.o cio.o ioinfo.o misc.o requestirq.o s390io.o export-objs += airq.o cio.o ioinfo.o requestirq.o s390io.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the linux kernel. # Makefile for the linux kernel.
# #
export-objs := newport.o shmiq.o sgicons.o usema.o export-objs := newport.o shmiq.o sgicons.o usema.o rrm.o
obj-y := newport.o shmiq.o sgicons.o usema.o streamable.o obj-y := newport.o shmiq.o sgicons.o usema.o streamable.o
obj-$(CONFIG_SGI_SERIAL) += sgiserial.o obj-$(CONFIG_SGI_SERIAL) += sgiserial.o
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for USB Core files and filesystem # Makefile for USB Core files and filesystem
# #
export-objs := usb.o hcd.o hcd-pci.o urb.o message.o config.o file.o export-objs := usb.o hcd.o hcd-pci.o urb.o message.o file.o
usbcore-objs := usb.o usb-debug.o hub.o hcd.o urb.o message.o \ usbcore-objs := usb.o usb-debug.o hub.o hcd.o urb.o message.o \
config.o file.o config.o file.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# framework and drivers # framework and drivers
# #
export-objs := usb-ohci.o
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
obj-$(CONFIG_USB_UHCI_HCD_ALT) += uhci-hcd.o obj-$(CONFIG_USB_UHCI_HCD_ALT) += uhci-hcd.o
......
export-objs := atyfb_base.o mach64_accel.o
obj-$(CONFIG_FB_ATY) += atyfb.o obj-$(CONFIG_FB_ATY) += atyfb.o
atyfb-y := atyfb_base.o mach64_accel.o ../cfbimgblt.o atyfb-y := atyfb_base.o mach64_accel.o ../cfbimgblt.o
......
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
O_TARGET := fs.o O_TARGET := fs.o
export-objs := filesystems.o open.o dcache.o buffer.o bio.o inode.o dquot.o \ export-objs := open.o dcache.o buffer.o bio.o inode.o dquot.o mpage.o
mpage.o
obj-y := open.o read_write.o devices.o file_table.o buffer.o \ obj-y := open.o read_write.o devices.o file_table.o buffer.o \
bio.o super.o block_dev.o char_dev.o stat.o exec.o pipe.o \ bio.o super.o block_dev.o char_dev.o stat.o exec.o pipe.o \
......
...@@ -6,6 +6,7 @@ export-objs := llc_macinit.o p8022.o psnap.o ...@@ -6,6 +6,7 @@ export-objs := llc_macinit.o p8022.o psnap.o
obj-y := p8023.o obj-y := p8023.o
# Check the p8022 selections against net/core/Makefile.
obj-$(CONFIG_SYSCTL) += sysctl_net_802.o obj-$(CONFIG_SYSCTL) += sysctl_net_802.o
obj-$(CONFIG_LLC) += p8022.o psnap.o llc_sendpdu.o llc_utility.o \ obj-$(CONFIG_LLC) += p8022.o psnap.o llc_sendpdu.o llc_utility.o \
cl2llc.o llc_macinit.o cl2llc.o llc_macinit.o
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the Linux networking core. # Makefile for the Linux networking core.
# #
export-objs := ext8022.o netfilter.o profile.o export-objs := ext8022.o
obj-y := sock.o skbuff.o iovec.o datagram.o scm.o obj-y := sock.o skbuff.o iovec.o datagram.o scm.o
...@@ -16,7 +16,8 @@ obj-$(CONFIG_FILTER) += filter.o ...@@ -16,7 +16,8 @@ obj-$(CONFIG_FILTER) += filter.o
obj-$(CONFIG_NET) += dev.o dev_mcast.o dst.o neighbour.o rtnetlink.o utils.o obj-$(CONFIG_NET) += dev.o dev_mcast.o dst.o neighbour.o rtnetlink.o utils.o
ifneq ($(CONFIG_LLC),n) # See p8022 in net/802/Makefile for config options to check
ifneq ($(CONFIG_LLC)$(CONFIG_TR)$(CONFIG_IPX)$(CONFIG_ATALK),)
obj-y += ext8022.o obj-y += ext8022.o
endif endif
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# Makefile for the Linux TCP/IP (INET) layer. # Makefile for the Linux TCP/IP (INET) layer.
# #
export-objs = ipip.o ip_gre.o
obj-y := utils.o route.o inetpeer.o proc.o protocol.o \ obj-y := utils.o route.o inetpeer.o proc.o protocol.o \
ip_input.o ip_fragment.o ip_forward.o ip_options.o \ ip_input.o ip_fragment.o ip_forward.o ip_options.o \
ip_output.o ip_sockglue.o \ ip_output.o ip_sockglue.o \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the Linux IPX layer. # Makefile for the Linux IPX layer.
# #
export-objs = af_ipx.o af_spx.o export-objs = af_ipx.o
obj-$(CONFIG_IPX) += ipx.o obj-$(CONFIG_IPX) += ipx.o
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# Makefile for the netlink driver. # Makefile for the netlink driver.
# #
export-objs := af_netlink.o
obj-y := af_netlink.o obj-y := af_netlink.o
obj-$(CONFIG_NETLINK_DEV) += netlink_dev.o obj-$(CONFIG_NETLINK_DEV) += netlink_dev.o
......
...@@ -3,6 +3,20 @@ ARCH=$2 ...@@ -3,6 +3,20 @@ ARCH=$2
SMP=$3 SMP=$3
CC=$4 CC=$4
# If compile.h exists already and we don't own autoconf.h
# (i.e. we're not the same user who did make *config), don't
# modify compile.h
# So "sudo make install" won't change the "compiled by <user>"
# do "compiled by root"
if [ -r $TARGET -a ! -O ../include/linux/autoconf.h ]; then
echo ' (not modified)'
exit 0
fi
# Do not expand names
set -f
if [ -r ../.version ]; then if [ -r ../.version ]; then
VERSION=`cat ../.version` VERSION=`cat ../.version`
else else
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Copyright (c) 1999,2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 1999,2001 by Jaroslav Kysela <perex@suse.cz>
# #
export-objs := sound.o pcm.o pcm_lib.o rawmidi.o timer.o rtctimer.o hwdep.o export-objs := sound.o pcm.o pcm_lib.o rawmidi.o timer.o hwdep.o
snd-objs := sound.o init.o isadma.o memory.o info.o control.o misc.o \ snd-objs := sound.o init.o isadma.o memory.o info.o control.o misc.o \
device.o wrappers.o device.o wrappers.o
......
...@@ -8,7 +8,7 @@ ifeq ($(CONFIG_SND_SEQUENCER_OSS),y) ...@@ -8,7 +8,7 @@ ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
obj-$(CONFIG_SND_SEQUENCER) += oss/ obj-$(CONFIG_SND_SEQUENCER) += oss/
endif endif
export-objs := seq_device.o seq.o seq_ports.o seq_instr.o seq_midi_emul.o \ export-objs := seq_device.o seq.o seq_instr.o seq_midi_emul.o \
seq_midi_event.o seq_virmidi.o seq_midi_event.o seq_virmidi.o
snd-seq-device-objs := seq_device.o snd-seq-device-objs := seq_device.o
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
export-objs := emu8000.o emu8000_synth.o sb_common.o sb8_main.o sb16_main.o sb16_csp.o export-objs := emu8000.o sb_common.o sb8_main.o sb16_main.o sb16_csp.o
snd-sb-common-objs := sb_common.o sb_mixer.o snd-sb-common-objs := sb_common.o sb_mixer.o
snd-sb8-dsp-objs := sb8_main.o sb8_midi.o snd-sb8-dsp-objs := sb8_main.o sb8_midi.o
......
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
# All of the (potential) objects that export symbols. # All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
export-objs := ad1848.o audio_syms.o midi_syms.o mpu401.o \ export-objs := ad1848.o audio_syms.o midi_syms.o mpu401.o ac97_codec.o \
msnd.o opl3.o sb_common.o sequencer_syms.o \ msnd.o opl3.o sb_common.o sequencer_syms.o ac97.o aci.o \
sound_syms.o uart401.o \ sound_syms.o uart401.o
nm256_audio.o ac97.o ac97_codec.o aci.o
# Each configuration option enables a list of files. # Each configuration option enables a list of files.
......
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