Revision f157ebba

b/Makefile
164 164

  
165 165
qemu-img.o: qemu-img-cmds.h
166 166

  
167
tools-obj-y = $(trace-obj-y) qemu-timer.o \
168
	main-loop.o iohandler.o error.o
169
tools-obj-$(CONFIG_POSIX) += compatfd.o
170

  
171
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y) libqemuutil.a libqemustub.a
172
qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y) libqemuutil.a libqemustub.a
173
qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) libqemuutil.a libqemustub.a
167
qemu-img$(EXESUF): qemu-img.o $(trace-obj-y) $(block-obj-y) libqemuutil.a libqemustub.a
168
qemu-nbd$(EXESUF): qemu-nbd.o $(trace-obj-y) $(block-obj-y) libqemuutil.a libqemustub.a
169
qemu-io$(EXESUF): qemu-io.o cmd.o $(trace-obj-y) $(block-obj-y) libqemuutil.a libqemustub.a
174 170

  
175 171
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
176 172

  
b/Makefile.objs
11 11
# QObject
12 12
qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o
13 13
qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o
14
qobject-obj-y += qerror.o error.o qemu-error.o
14
qobject-obj-y += qerror.o
15 15

  
16 16
universal-obj-y += $(qobject-obj-y)
17 17

  
......
24 24
#######################################################################
25 25
# Core hw code (qdev core)
26 26
hw-core-obj-y += hw/
27
hw-core-obj-y += qemu-option.o
28 27

  
29 28
universal-obj-y += $(hw-core-obj-y)
30 29

  
31 30
#######################################################################
32 31
# util-obj-y is code depending on the OS (win32 vs posix)
33 32
util-obj-y = osdep.o cutils.o qemu-timer-common.o
34
util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
35
util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o
33
util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o event_notifier-win32.o
34
util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o event_notifier-posix.o
35
util-obj-y += envlist.o path.o host-utils.o cache-utils.o module.o
36
util-obj-y += bitmap.o bitops.o
37
util-obj-y += acl.o
38
util-obj-y += error.o qemu-error.o
39
util-obj-$(CONFIG_POSIX) += compatfd.o
40
util-obj-y += iov.o aes.o qemu-config.o qemu-sockets.o uri.o notify.o
41
util-obj-y += qemu-option.o qemu-progress.o
36 42

  
37 43
#######################################################################
38 44
# coroutines
......
54 60
#######################################################################
55 61
# block-obj-y is code used by both qemu system emulation and qemu-img
56 62

  
57
block-obj-y = iov.o cache-utils.o qemu-option.o module.o async.o
58
block-obj-y += nbd.o block.o blockjob.o aes.o qemu-config.o
59
block-obj-y += thread-pool.o qemu-progress.o qemu-sockets.o uri.o notify.o
63
block-obj-y = async.o thread-pool.o
64
block-obj-y += nbd.o block.o blockjob.o
60 65
block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y)
61
block-obj-$(CONFIG_POSIX) += event_notifier-posix.o aio-posix.o
62
block-obj-$(CONFIG_WIN32) += event_notifier-win32.o aio-win32.o
66
block-obj-y += main-loop.o iohandler.o qemu-timer.o
67
block-obj-$(CONFIG_POSIX) += aio-posix.o
68
block-obj-$(CONFIG_WIN32) += aio-win32.o
63 69
block-obj-y += block/
64 70
block-obj-y += $(qapi-obj-y) qapi-types.o qapi-visit.o
65 71

  
......
84 90
common-obj-$(CONFIG_LINUX) += fsdev/
85 91
extra-obj-$(CONFIG_LINUX) += fsdev/
86 92

  
87
common-obj-y += tcg-runtime.o host-utils.o main-loop.o
88
common-obj-y += migration.o migration-tcp.o
93
common-obj-y += tcg-runtime.o
89 94
common-obj-y += migration.o migration-tcp.o
90 95
common-obj-y += qemu-char.o #aio.o
91
common-obj-y += block-migration.o iohandler.o
92
common-obj-y += bitmap.o bitops.o
96
common-obj-y += block-migration.o
93 97
common-obj-y += page_cache.o
94 98

  
95 99
common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
......
105 109
common-obj-y += bt-host.o bt-vhci.o
106 110

  
107 111
common-obj-y += dma-helpers.o
108
common-obj-y += acl.o
109
common-obj-$(CONFIG_POSIX) += compatfd.o
110
common-obj-y += qemu-timer.o qemu-timer-common.o
111 112
common-obj-y += qtest.o
112 113
common-obj-y += vl.o
113 114

  
......
125 126
# libuser
126 127

  
127 128
user-obj-y =
128
user-obj-y += envlist.o path.o
129
user-obj-y += tcg-runtime.o host-utils.o
130
user-obj-y += cache-utils.o
131
user-obj-y += module.o
129
user-obj-y += tcg-runtime.o
132 130
user-obj-y += qom/
133 131

  
134 132
######################################################################
......
169 167
######################################################################
170 168
# guest agent
171 169

  
172
qga-obj-y = qga/ module.o
173
qga-obj-$(CONFIG_POSIX) += qemu-sockets.o qemu-option.o
170
qga-obj-y = qga/
174 171

  
175 172
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
176 173

  
b/tests/Makefile
80 80
tests/check-qdict$(EXESUF): tests/check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o
81 81
tests/check-qlist$(EXESUF): tests/check-qlist.o qlist.o qint.o
82 82
tests/check-qfloat$(EXESUF): tests/check-qfloat.o qfloat.o
83
tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) libqemustub.a
84
tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) iov.o libqemustub.a
85
tests/test-aio$(EXESUF): tests/test-aio.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) libqemustub.a
86
tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) libqemustub.a
87
tests/test-iov$(EXESUF): tests/test-iov.o iov.o
83
tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) libqemuutil.a libqemustub.a
84
tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(block-obj-y) libqemuutil.a libqemustub.a
85
tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a libqemustub.a
86
tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(block-obj-y) libqemuutil.a libqemustub.a
87
tests/test-iov$(EXESUF): tests/test-iov.o libqemuutil.a
88 88

  
89 89
tests/test-qapi-types.c tests/test-qapi-types.h :\
90 90
$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py

Also available in: Unified diff