[Qemu-devel] [PATCH 04/20] Use CONFIG_NOWIN32 previus define to simplify Makefile

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 5a2570e..be5452c 100644
--- a/Makefile
+++ b/Makefile
@@ -50,21 +50,13 @@ recurse-all: $(SUBDIR_RULES)

 block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
 block-obj-y += nbd.o block.o aio.o aes.o
+block-obj-$(CONFIG_AIO) += posix-aio-compat.o

 block-nested-y += cow.o qcow.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o
 block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o
 block-nested-y += parallels.o nbd.o
-
-
-ifdef CONFIG_WIN32
-block-nested-y += raw-win32.o
-else
-ifdef CONFIG_AIO
-block-obj-y += posix-aio-compat.o
-endif
-block-nested-y += raw-posix.o
-endif
-
+block-nested-$(CONFIG_WIN32) += raw-win32.o
+block-nested-$(CONFIG_NOWIN32) += raw-posix.o
 block-nested-$(CONFIG_CURL) += curl.o

 block-obj-y +=  $(addprefix block/, $(block-nested-y))
@@ -95,12 +87,8 @@ obj-y += msmouse.o ps2.o
 obj-y += qdev.o qdev-properties.o ssi.o

 obj-$(CONFIG_BRLAPI) += baum.o
-
-ifdef CONFIG_WIN32
-obj-y += tap-win32.o
-else
-obj-y += migration-exec.o
-endif
+obj-$(CONFIG_WIN32) += tap-win32.o
+obj-$(CONFIG_NOWIN32) += migration-exec.o

 ifdef CONFIG_FMOD
 audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(FMOD_CFLAGS) $(CPPFLAGS)
-- 
1.6.2.5