提交 4de67f2f 编写于 作者: J Juan Quintela 提交者: Anthony Liguori

Make slirp include dir globlal in cflags

We already include it everywhere
Signed-off-by: NJuan Quintela <quintela@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-Id: 
上级 864de24a
...@@ -135,10 +135,6 @@ obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o ...@@ -135,10 +135,6 @@ obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
obj-$(CONFIG_COCOA) += cocoa.o obj-$(CONFIG_COCOA) += cocoa.o
obj-$(CONFIG_IOTHREAD) += qemu-thread.o obj-$(CONFIG_IOTHREAD) += qemu-thread.o
ifdef CONFIG_SLIRP
QEMU_CFLAGS+=-I$(SRC_PATH)/slirp
endif
slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o
slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o
......
...@@ -313,9 +313,6 @@ obj-m68k-y += m68k-semi.o dummy_m68k.o ...@@ -313,9 +313,6 @@ obj-m68k-y += m68k-semi.o dummy_m68k.o
ifdef CONFIG_COCOA ifdef CONFIG_COCOA
COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
endif endif
ifdef CONFIG_SLIRP
QEMU_CFLAGS+=-I$(SRC_PATH)/slirp
endif
# profiling code # profiling code
ifdef TARGET_GPROF ifdef TARGET_GPROF
......
...@@ -1604,6 +1604,7 @@ if test $profiler = "yes" ; then ...@@ -1604,6 +1604,7 @@ if test $profiler = "yes" ; then
fi fi
if test "$slirp" = "yes" ; then if test "$slirp" = "yes" ; then
echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SLIRP=y" >> $config_host_mak
CFLAGS="-I\$(SRC_PATH)/slirp $CFLAGS"
fi fi
if test "$vde" = "yes" ; then if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak echo "CONFIG_VDE=y" >> $config_host_mak
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册