[65/81] Make slirp include dir globlal in cflags
diff mbox

Message ID 95d97eed8b0639ad61d02a0fbab66b9b850e42d1.1249301360.git.quintela@redhat.com
State Superseded
Headers show

Commit Message

Juan Quintela Aug. 3, 2009, 12:46 p.m. UTC
We already include it everywhere

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    4 ----
 Makefile.target |    3 ---
 configure       |    1 +
 3 files changed, 1 insertions(+), 7 deletions(-)

Patch
diff mbox

diff --git a/Makefile b/Makefile
index 1b7839a..270ca59 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 dfbb5e9..a4d269d 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 a6494ca..9d54aaa 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