summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-10-22 17:49:04 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-30 08:39:27 -0500
commit33ad161a0412bf959548cf220f44afe6060eefe5 (patch)
treebcf6491e102cf8f6f5f323d1a4c19f1172a697f7
parent7200ac3c7c8eefe574193b49eeff09f120e11ec7 (diff)
downloadqemu-33ad161a0412bf959548cf220f44afe6060eefe5.tar.gz
net: move tap-win32.c under net/
Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile2
-rw-r--r--net/tap-win32.c (renamed from tap-win32.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5a9de55ff1..6328aee852 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,7 @@ block-obj-y += $(addprefix block/, $(block-nested-y))
net-obj-y = net.o
net-nested-y = queue.o checksum.o
+net-nested-$(CONFIG_WIN32) += tap-win32.o
net-obj-y += $(addprefix net/, $(net-nested-y))
######################################################################
@@ -132,7 +133,6 @@ obj-y += qdev.o qdev-properties.o
obj-y += qint.o qstring.o qdict.o qlist.o qemu-config.o
obj-$(CONFIG_BRLAPI) += baum.o
-obj-$(CONFIG_WIN32) += tap-win32.o
obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
diff --git a/tap-win32.c b/net/tap-win32.c
index 7d92df2aa3..7d92df2aa3 100644
--- a/tap-win32.c
+++ b/net/tap-win32.c