From 4de67f2fa79dd80268fc3af7e6df415953610b88 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 3 Aug 2009 14:46:56 +0200 Subject: [PATCH] Make slirp include dir globlal in cflags We already include it everywhere Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori Message-Id: --- Makefile | 4 ---- Makefile.target | 3 --- configure | 1 + 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index de7770f370..7294bfed5f 100644 --- a/Makefile +++ b/Makefile @@ -135,10 +135,6 @@ obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o obj-$(CONFIG_COCOA) += cocoa.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 += 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 diff --git a/Makefile.target b/Makefile.target index 2f3a135775..ec06d77c73 100644 --- a/Makefile.target +++ b/Makefile.target @@ -313,9 +313,6 @@ obj-m68k-y += m68k-semi.o dummy_m68k.o ifdef CONFIG_COCOA COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit endif -ifdef CONFIG_SLIRP -QEMU_CFLAGS+=-I$(SRC_PATH)/slirp -endif # profiling code ifdef TARGET_GPROF diff --git a/configure b/configure index 88f031ff6c..202339b3c6 100755 --- a/configure +++ b/configure @@ -1604,6 +1604,7 @@ if test $profiler = "yes" ; then fi if test "$slirp" = "yes" ; then echo "CONFIG_SLIRP=y" >> $config_host_mak + CFLAGS="-I\$(SRC_PATH)/slirp $CFLAGS" fi if test "$vde" = "yes" ; then echo "CONFIG_VDE=y" >> $config_host_mak