[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 28/46] Use CONFIG_POSIX to simplify Makefile
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 28/46] Use CONFIG_POSIX to simplify Makefile |
Date: |
Fri, 24 Jul 2009 20:30:28 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 47e5825..a53b630 100644
--- a/Makefile
+++ b/Makefile
@@ -62,21 +62,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_POSIX) += raw-posix.o
block-nested-$(CONFIG_CURL) += curl.o
block-obj-y += $(addprefix block/, $(block-nested-y))
@@ -112,11 +104,8 @@ ifdef CONFIG_BRLAPI
LIBS+=-lbrlapi
endif
-ifdef CONFIG_WIN32
-obj-y += tap-win32.o
-else
-obj-y += migration-exec.o
-endif
+obj-$(CONFIG_WIN32) += tap-win32.o
+obj-$(CONFIG_POSIX) += migration-exec.o
ifdef CONFIG_COREAUDIO
AUDIO_PT = y
--
1.6.2.5
- [Qemu-devel] [PATCH v2 00/46] More configure/Makefile cleanups, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 24/46] rename DEBUG_TCG to CONFIG_DEBUG_TCG, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 25/46] rename DEBUG_EXEC to CONFIG_DEBUG_EXEC, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 26/46] rename WORDS_BIGENDIAN to CONFIG_WORDS_BIGENDIAN, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 27/46] Add CONFIG_POSIX, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 29/46] the else part of this test is obsolete We are testing for sdl = yes inside the else part of the test if sdl = yes, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 28/46] Use CONFIG_POSIX to simplify Makefile,
Juan Quintela <=
- [Qemu-devel] [PATCH 30/46] sdl_config value was always sdl-config, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 31/46] Calculate sdl_libs and sdl_flags and use them everywhere, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 22/46] rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_H, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 32/46] instead of setup sdl_x11 just add -lX11 to sdl_libs, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 34/46] remove sdl_static. Just do the right thing if static is yes, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 33/46] target_softmmu is undefined at that point, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 36/46] Define and use xen libs in a single place, Juan Quintela, 2009/07/24