[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 65/81] Make slirp include dir globlal in cflags
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 65/81] Make slirp include dir globlal in cflags |
Date: |
Mon, 3 Aug 2009 14:46:56 +0200 |
We already include it everywhere
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 4 ----
Makefile.target | 3 ---
configure | 1 +
3 files changed, 1 insertions(+), 7 deletions(-)
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
--
1.6.2.5
- [Qemu-devel] [PATCH 58/81] this bit was already generated in configure, (continued)
- [Qemu-devel] [PATCH 58/81] this bit was already generated in configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 59/81] Fold TARGET_GPROF handling in configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 60/81] Generate more conmmon CFLAGS, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 61/81] Added CONFIG_NEED_MMU for microblaze and cris, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 62/81] Move dis-* selection to configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 63/81] Use only one KVM_CFLAGS, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 64/81] Use one less HELPER_CFLAGS, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 67/81] AUDIO_PT is not needed, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 66/81] FMOD_CFLAGS is not set when CONFIG_FMOD is undef, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 68/81] Generate CONFIG_AUDIO_PT_INT in configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 65/81] Make slirp include dir globlal in cflags,
Juan Quintela <=
- [Qemu-devel] [PATCH 69/81] CONFIG_POSIX makes more sense that not CONFIG_WIN32, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 70/81] remove last 3 uses of :=, everywhere else uses += or =, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 71/81] Consolidate audio flags in configure, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 73/81] use TARGET_<arch name> for selection, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 72/81] We also need TARGET_<arechname> in Makefiles, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 74/81] Disable aio in mingw32, Juan Quintela, 2009/08/03