gwj / at91sam9263 · Commits

Commit 319f08ea7ef9f947f6713dd8934f19515ba36c3a

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent a8e492c0

Rename BLOCK_OBJS to block-obj-y 

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 16 additions and 16 deletions
Makefile
  View file @319f08e
... ... @@ -64,27 +64,27 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a
64 64 recurse-all: $(SUBDIR_RULES)
65 65  
66 66 #######################################################################
67   -# BLOCK_OBJS is code used by both qemu system emulation and qemu-img
  67 +# block-obj-y is code used by both qemu system emulation and qemu-img
68 68  
69   -BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
70   -BLOCK_OBJS+=block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o
71   -BLOCK_OBJS+=block/dmg.o block/bochs.o block/vpc.o block/vvfat.o
72   -BLOCK_OBJS+=block/qcow2.o block/qcow2-refcount.o block/qcow2-cluster.o
73   -BLOCK_OBJS+=block/qcow2-snapshot.o
74   -BLOCK_OBJS+=block/parallels.o block/nbd.o
75   -BLOCK_OBJS+=nbd.o block.o aio.o
  69 +block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
  70 +block-obj-y += block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o
  71 +block-obj-y += block/dmg.o block/bochs.o block/vpc.o block/vvfat.o
  72 +block-obj-y += block/qcow2.o block/qcow2-refcount.o block/qcow2-cluster.o
  73 +block-obj-y += block/qcow2-snapshot.o
  74 +block-obj-y += block/parallels.o block/nbd.o
  75 +block-obj-y += nbd.o block.o aio.o
76 76  
77 77 ifdef CONFIG_WIN32
78   -BLOCK_OBJS += block/raw-win32.o
  78 +block-obj-y += block/raw-win32.o
79 79 else
80 80 ifdef CONFIG_AIO
81   -BLOCK_OBJS += posix-aio-compat.o
  81 +block-obj-y += posix-aio-compat.o
82 82 endif
83   -BLOCK_OBJS += block/raw-posix.o
  83 +block-obj-y += block/raw-posix.o
84 84 endif
85 85  
86 86 ifdef CONFIG_CURL
87   -BLOCK_OBJS += block/curl.o
  87 +block-obj-y += block/curl.o
88 88 endif
89 89  
90 90 ######################################################################
... ... @@ -93,7 +93,7 @@ endif
93 93 # system emulation, i.e. a single QEMU executable should support all
94 94 # CPUs and machines.
95 95  
96   -OBJS=$(BLOCK_OBJS)
  96 +OBJS=$(block-obj-y)
97 97 OBJS+=readline.o console.o
98 98  
99 99 OBJS+=irq.o ptimer.o
... ... @@ -245,11 +245,11 @@ libqemu_user.a: $(USER_OBJS)
245 245  
246 246 qemu-img.o: qemu-img-cmds.h
247 247  
248   -qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
  248 +qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(block-obj-y)
249 249  
250   -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
  250 +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(block-obj-y)
251 251  
252   -qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(BLOCK_OBJS)
  252 +qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(block-obj-y)
253 253  
254 254 qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz
255 255  
... ...