gwj / at91sam9263 · Commits

Commit eeb6d45bfe2839a246da1e7e94a3d5c58c05cd09

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 35f4df27

Use CONFIG_POSIX to simplify Makefile 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 1 changed file with 5 additions and 16 deletions
Makefile
  View file @eeb6d45
@@ -62,21 +62,13 @@ recurse-all: $(SUBDIR_RULES) @@ -62,21 +62,13 @@ recurse-all: $(SUBDIR_RULES)
62 62
63 block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o 63 block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
64 block-obj-y += nbd.o block.o aio.o aes.o 64 block-obj-y += nbd.o block.o aio.o aes.o
  65 +block-obj-$(CONFIG_AIO) += posix-aio-compat.o
65 66
66 block-nested-y += cow.o qcow.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o 67 block-nested-y += cow.o qcow.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o
67 block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o 68 block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o
68 block-nested-y += parallels.o nbd.o 69 block-nested-y += parallels.o nbd.o
69 -  
70 -  
71 -ifdef CONFIG_WIN32  
72 -block-nested-y += raw-win32.o  
73 -else  
74 -ifdef CONFIG_AIO  
75 -block-obj-y += posix-aio-compat.o  
76 -endif  
77 -block-nested-y += raw-posix.o  
78 -endif  
79 - 70 +block-nested-$(CONFIG_WIN32) += raw-win32.o
  71 +block-nested-$(CONFIG_POSIX) += raw-posix.o
80 block-nested-$(CONFIG_CURL) += curl.o 72 block-nested-$(CONFIG_CURL) += curl.o
81 73
82 block-obj-y += $(addprefix block/, $(block-nested-y)) 74 block-obj-y += $(addprefix block/, $(block-nested-y))
@@ -112,11 +104,8 @@ ifdef CONFIG_BRLAPI @@ -112,11 +104,8 @@ ifdef CONFIG_BRLAPI
112 LIBS+=-lbrlapi 104 LIBS+=-lbrlapi
113 endif 105 endif
114 106
115 -ifdef CONFIG_WIN32  
116 -obj-y += tap-win32.o  
117 -else  
118 -obj-y += migration-exec.o  
119 -endif 107 +obj-$(CONFIG_WIN32) += tap-win32.o
  108 +obj-$(CONFIG_POSIX) += migration-exec.o
120 109
121 ifdef CONFIG_COREAUDIO 110 ifdef CONFIG_COREAUDIO
122 AUDIO_PT = y 111 AUDIO_PT = y