mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-16 22:10:24 +00:00
821f3eff7c
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
kbuild: introduce ccflags-y, asflags-y and ldflags-y
kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
kbuild: enable use of AFLAGS and CFLAGS on commandline
kbuild: enable 'make AFLAGS=...' to add additional options to AS
kbuild: fix AFLAGS use in h8300 and m68knommu
kbuild: check for wrong use of CFLAGS
kbuild: enable 'make CFLAGS=...' to add additional options to CC
kbuild: fix up CFLAGS usage
kbuild: make modpost detect unterminated device id lists
kbuild: call export_report from the Makefile
kbuild: move Kai Germaschewski to CREDITS
kconfig/menuconfig: distinguish between selected-by-another options and comments
kconfig: tristate choices with mixed tristate and boolean values
include/linux/Kbuild: remove duplicate entries
kbuild: kill backward compatibility checks
kbuild: kill EXTRA_ARFLAGS
kbuild: fix documentation in makefiles.txt
kbuild: call make once for all targets when O=.. is used
kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
kbuild: update _shipped files for kconfig syntax cleanup
...
Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.
67 lines
2.2 KiB
Makefile
67 lines
2.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) $(KBUILD_CFLAGS) -print-file-name=libpcap.a)
|
|
|
|
LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)
|
|
|
|
targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o
|
|
|
|
$(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
|
|
$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o)
|
|
|
|
$(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o
|
|
$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_vde.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_VDE) += vde.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 vde_user.o
|
|
|
|
include arch/um/scripts/Makefile.rules
|