diff options
Diffstat (limited to 'arch/um/drivers/Makefile')
-rw-r--r-- | arch/um/drivers/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile index de17d4c6e02d..634968150bd6 100644 --- a/arch/um/drivers/Makefile +++ b/arch/um/drivers/Makefile | |||
@@ -19,10 +19,16 @@ harddog-objs := harddog_kern.o harddog_user.o | |||
19 | 19 | ||
20 | LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a) | 20 | LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a) |
21 | 21 | ||
22 | targets := pcap_kern.o pcap_user.o | 22 | LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a) |
23 | |||
24 | targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o | ||
23 | 25 | ||
24 | $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o | 26 | $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o |
25 | $(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o) | 27 | $(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o) |
28 | |||
29 | $(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o | ||
30 | $(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_vde.o) | ||
31 | |||
26 | #XXX: The call below does not work because the flags are added before the | 32 | #XXX: The call below does not work because the flags are added before the |
27 | # object name, so nothing from the library gets linked. | 33 | # object name, so nothing from the library gets linked. |
28 | #$(call if_changed,ld) | 34 | #$(call if_changed,ld) |
@@ -37,6 +43,7 @@ obj-$(CONFIG_STDERR_CONSOLE) += stderr_console.o | |||
37 | obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o | 43 | obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o |
38 | obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o | 44 | obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o |
39 | obj-$(CONFIG_UML_NET_DAEMON) += daemon.o | 45 | obj-$(CONFIG_UML_NET_DAEMON) += daemon.o |
46 | obj-$(CONFIG_UML_NET_VDE) += vde.o | ||
40 | obj-$(CONFIG_UML_NET_MCAST) += mcast.o | 47 | obj-$(CONFIG_UML_NET_MCAST) += mcast.o |
41 | obj-$(CONFIG_UML_NET_PCAP) += pcap.o | 48 | obj-$(CONFIG_UML_NET_PCAP) += pcap.o |
42 | obj-$(CONFIG_UML_NET) += net.o | 49 | obj-$(CONFIG_UML_NET) += net.o |
@@ -54,6 +61,6 @@ obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o | |||
54 | obj-$(CONFIG_UML_RANDOM) += random.o | 61 | obj-$(CONFIG_UML_RANDOM) += random.o |
55 | 62 | ||
56 | # pcap_user.o must be added explicitly. | 63 | # pcap_user.o must be added explicitly. |
57 | USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o | 64 | USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o |
58 | 65 | ||
59 | include arch/um/scripts/Makefile.rules | 66 | include arch/um/scripts/Makefile.rules |