Revision ff667e2e

b/Makefile
135 135

  
136 136
$(SUBDIR_RULES): libqemuutil.a libqemustub.a
137 137

  
138
$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y)
138
$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(common-obj-y) $(extra-obj-y)
139 139

  
140
$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(user-obj-y)
140
$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(user-obj-y)
141 141

  
142 142
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
143 143
romsubdir-%:
......
164 164

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

  
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
167
qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a
168
qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) libqemuutil.a libqemustub.a
169
qemu-io$(EXESUF): qemu-io.o cmd.o $(block-obj-y) libqemuutil.a libqemustub.a
170 170

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

  
173
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o $(trace-obj-y) libqemuutil.a libqemustub.a
173
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o libqemuutil.a libqemustub.a
174 174
fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
175 175

  
176 176
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
......
206 206
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
207 207
$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
208 208

  
209
qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) libqemuutil.a libqemustub.a
209
qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a
210 210
	$(call LINK, $^)
211 211

  
212 212
clean:
b/Makefile.objs
1 1
#######################################################################
2 2
# Common libraries for tools and emulators
3 3
stub-obj-y = stubs/
4
util-obj-y = util/ qobject/ qapi/
4
util-obj-y = util/ qobject/ qapi/ trace/
5 5

  
6 6
#######################################################################
7 7
# block-obj-y is code used by both qemu system emulation and qemu-img
......
78 78
endif
79 79

  
80 80
######################################################################
81
# trace
82

  
83
trace-obj-y += trace/
84

  
85
######################################################################
86 81
# smartcard
87 82

  
88 83
libcacard-y += libcacard/cac.o libcacard/event.o
......
107 102
universal-obj-y += hw/
108 103
universal-obj-y += qom/
109 104
universal-obj-y += disas/
110
universal-obj-y += $(trace-obj-y)
111 105

  
112 106
######################################################################
113 107
# guest agent
......
129 123
	block-obj-y \
130 124
	common-obj-y \
131 125
	universal-obj-y \
132
	extra-obj-y \
133
	trace-obj-y
126
	extra-obj-y
134 127
dummy := $(call unnest-vars)
b/libcacard/Makefile
3 3
TOOLS += vscclient$(EXESUF)
4 4

  
5 5
# objects linked into a shared library, built with libtool with -fPIC if required
6
libcacard-obj-y = $(trace-obj-y) $(stub-obj-y) $(libcacard-y)
6
libcacard-obj-y = $(stub-obj-y) $(libcacard-y)
7 7
libcacard-obj-y += util/osdep.o util/cutils.o util/qemu-timer-common.o util/error.o
8 8
libcacard-obj-$(CONFIG_WIN32) += util/oslib-win32.o util/qemu-thread-win32.o
9 9
libcacard-obj-$(CONFIG_POSIX) += util/oslib-posix.o util/qemu-thread-posix.o
10
libcacard-obj-y += $(filter trace/%, $(util-obj-y))
10 11

  
11 12
libcacard-lobj-y=$(patsubst %.o,%.lo,$(libcacard-obj-y))
12 13

  
b/tests/Makefile
104 104
tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp-marshal.o $(test-qapi-obj-y) qapi-types.o qapi-visit.o libqemuutil.a libqemustub.a
105 105
tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a
106 106

  
107
tests/rtc-test$(EXESUF): tests/rtc-test.o $(trace-obj-y)
108
tests/m48t59-test$(EXESUF): tests/m48t59-test.o $(trace-obj-y)
109
tests/fdc-test$(EXESUF): tests/fdc-test.o tests/libqtest.o $(trace-obj-y)
110
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o tests/libqtest.o $(trace-obj-y)
107
tests/rtc-test$(EXESUF): tests/rtc-test.o
108
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
109
tests/fdc-test$(EXESUF): tests/fdc-test.o
110
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
111 111

  
112 112
# QTest rules
113 113

  
b/trace/Makefile.objs
51 51
######################################################################
52 52
# Backend code
53 53

  
54
trace-obj-$(CONFIG_TRACE_DEFAULT) += default.o
55
trace-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
56
trace-obj-$(CONFIG_TRACE_STDERR) += stderr.o
57
trace-obj-y += control.o
58
trace-obj-y += generated-tracers.o
54
util-obj-$(CONFIG_TRACE_DEFAULT) += default.o
55
util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
56
util-obj-$(CONFIG_TRACE_STDERR) += stderr.o
57
util-obj-y += control.o
58
util-obj-y += generated-tracers.o

Also available in: Unified diff