|
From: | Sebastian Herbszt |
Subject: | [Qemu-devel] Re: [PATCH 29/47] Use CONFIG_POSIX to simplify Makefile |
Date: | Sat, 1 Aug 2009 17:54:37 +0200 |
Juan Quintela wrote:
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
I think this patch or a related one breaks MinGW/Win32: CC posix-aio-compat.o posix-aio-compat.c:14:23: warning: sys/ioctl.h: No such file or directory posix-aio-compat.c: In function `handle_aiocb_ioctl': posix-aio-compat.c:90: warning: implicit declaration of function `ioctl' posix-aio-compat.c: In function `handle_aiocb_rw_linear': posix-aio-compat.c:182: warning: implicit declaration of function `pwrite' posix-aio-compat.c:187: warning: implicit declaration of function `pread' posix-aio-compat.c: In function `aio_thread': posix-aio-compat.c:284: warning: implicit declaration of function `sigfillset' posix-aio-compat.c:285: warning: implicit declaration of function `sigprocmask' posix-aio-compat.c:332: warning: implicit declaration of function `kill' posix-aio-compat.c: In function `qemu_paio_submit': posix-aio-compat.c:367: error: `EINPROGRESS' undeclared (first use in this function) posix-aio-compat.c:367: error: (Each undeclared identifier is reported only once posix-aio-compat.c:367: error: for each function it appears in.) posix-aio-compat.c: In function `qemu_paio_cancel': posix-aio-compat.c:424: error: `ECANCELED' undeclared (first use in this function) posix-aio-compat.c:426: error: `EINPROGRESS' undeclared (first use in this function) make: *** [posix-aio-compat.o] Error 1 v0.11.0-rc0-182-g28e738d on gcc version 3.4.5 (mingw32 special) - Sebastian
[Prev in Thread] | Current Thread | [Next in Thread] |