91acb21f08
The patch to use host AIO support that I submitted early after 2.6.13 exposed some problems in the block driver. I have fixes for these, but am not comfortable putting them into 2.6.14 at this late date. So, this patch reverts the use of host AIO. I will resubmit the original patch, plus fixes to the driver after 2.6.14 in order to get a reasonable amount of testing before they're exposed to the general public. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
59 lines
2 KiB
Makefile
59 lines
2 KiB
Makefile
#
|
|
# Copyright (C) 2000, 2002, 2003 Jeff Dike (jdike@karaya.com)
|
|
# Licensed under the GPL
|
|
#
|
|
|
|
# pcap is broken in 2.5 because kbuild doesn't allow pcap.a to be linked
|
|
# in to pcap.o
|
|
|
|
slip-objs := slip_kern.o slip_user.o
|
|
slirp-objs := slirp_kern.o slirp_user.o
|
|
daemon-objs := daemon_kern.o daemon_user.o
|
|
mcast-objs := mcast_kern.o mcast_user.o
|
|
net-objs := net_kern.o net_user.o
|
|
mconsole-objs := mconsole_kern.o mconsole_user.o
|
|
hostaudio-objs := hostaudio_kern.o
|
|
ubd-objs := ubd_kern.o ubd_user.o
|
|
port-objs := port_kern.o port_user.o
|
|
harddog-objs := harddog_kern.o harddog_user.o
|
|
|
|
LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a)
|
|
|
|
targets := pcap_kern.o pcap_user.o
|
|
|
|
$(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
|
|
$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o)
|
|
#XXX: The call below does not work because the flags are added before the
|
|
# object name, so nothing from the library gets linked.
|
|
#$(call if_changed,ld)
|
|
|
|
# When the above is fixed, don't forget to add this too!
|
|
#targets += $(obj)/pcap.o
|
|
|
|
obj-y := stdio_console.o fd.o chan_kern.o chan_user.o line.o
|
|
obj-$(CONFIG_SSL) += ssl.o
|
|
obj-$(CONFIG_STDERR_CONSOLE) += stderr_console.o
|
|
|
|
obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o
|
|
obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o
|
|
obj-$(CONFIG_UML_NET_DAEMON) += daemon.o
|
|
obj-$(CONFIG_UML_NET_MCAST) += mcast.o
|
|
obj-$(CONFIG_UML_NET_PCAP) += pcap.o
|
|
obj-$(CONFIG_UML_NET) += net.o
|
|
obj-$(CONFIG_MCONSOLE) += mconsole.o
|
|
obj-$(CONFIG_MMAPPER) += mmapper_kern.o
|
|
obj-$(CONFIG_BLK_DEV_UBD) += ubd.o
|
|
obj-$(CONFIG_HOSTAUDIO) += hostaudio.o
|
|
obj-$(CONFIG_NULL_CHAN) += null.o
|
|
obj-$(CONFIG_PORT_CHAN) += port.o
|
|
obj-$(CONFIG_PTY_CHAN) += pty.o
|
|
obj-$(CONFIG_TTY_CHAN) += tty.o
|
|
obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
|
|
obj-$(CONFIG_UML_WATCHDOG) += harddog.o
|
|
obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
|
|
obj-$(CONFIG_UML_RANDOM) += random.o
|
|
|
|
# pcap_user.o must be added explicitly.
|
|
USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o
|
|
|
|
include arch/um/scripts/Makefile.rules
|