Revision 8a090705
b/Makefile | ||
---|---|---|
133 | 133 |
$(SRC_PATH)/pixman/configure: |
134 | 134 |
(cd $(SRC_PATH)/pixman; autoreconf -v --install) |
135 | 135 |
|
136 |
$(SUBDIR_RULES): libqemustub.a |
|
136 |
$(SUBDIR_RULES): libqemuutil.a libqemustub.a
|
|
137 | 137 |
|
138 | 138 |
$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) |
139 | 139 |
|
... | ... | |
155 | 155 |
version-obj-$(CONFIG_WIN32) += version.o |
156 | 156 |
|
157 | 157 |
###################################################################### |
158 |
# Build library with stubs
|
|
158 |
# Build libraries
|
|
159 | 159 |
|
160 | 160 |
libqemustub.a: $(stub-obj-y) |
161 |
libqemuutil.a: $(util-obj-y) |
|
161 | 162 |
|
162 | 163 |
###################################################################### |
163 | 164 |
|
164 | 165 |
qemu-img.o: qemu-img-cmds.h |
165 | 166 |
|
166 |
tools-obj-y = $(util-obj-y) $(trace-obj-y) qemu-timer.o \
|
|
167 |
tools-obj-y = $(trace-obj-y) qemu-timer.o \ |
|
167 | 168 |
main-loop.o iohandler.o error.o |
168 | 169 |
tools-obj-$(CONFIG_POSIX) += compatfd.o |
169 | 170 |
|
170 |
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y) libqemustub.a |
|
171 |
qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y) libqemustub.a |
|
172 |
qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) libqemustub.a |
|
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
|
|
173 | 174 |
|
174 | 175 |
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o |
175 | 176 |
|
176 |
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
|
|
177 |
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o $(trace-obj-y) libqemuutil.a libqemustub.a
|
|
177 | 178 |
fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap |
178 | 179 |
|
179 | 180 |
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx |
... | ... | |
209 | 210 |
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) |
210 | 211 |
$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) |
211 | 212 |
|
212 |
qemu-ga$(EXESUF): $(qga-obj-y) $(util-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a
|
|
213 |
qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a
|
|
213 | 214 |
$(call LINK, $^) |
214 | 215 |
|
215 | 216 |
clean: |
b/Makefile.objs | ||
---|---|---|
78 | 78 |
common-obj-y += net/ |
79 | 79 |
common-obj-y += qom/ |
80 | 80 |
common-obj-y += readline.o |
81 |
common-obj-y += $(util-obj-y) |
|
82 | 81 |
common-obj-$(CONFIG_WIN32) += os-win32.o |
83 | 82 |
common-obj-$(CONFIG_POSIX) += os-posix.o |
84 | 83 |
|
b/Makefile.target | ||
---|---|---|
83 | 83 |
QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user |
84 | 84 |
|
85 | 85 |
obj-y += linux-user/ |
86 |
obj-y += gdbstub.o thunk.o user-exec.o $(util-obj-y)
|
|
86 |
obj-y += gdbstub.o thunk.o user-exec.o |
|
87 | 87 |
|
88 | 88 |
endif #CONFIG_LINUX_USER |
89 | 89 |
|
... | ... | |
95 | 95 |
QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH) |
96 | 96 |
|
97 | 97 |
obj-y += bsd-user/ |
98 |
obj-y += gdbstub.o user-exec.o $(util-obj-y)
|
|
98 |
obj-y += gdbstub.o user-exec.o |
|
99 | 99 |
|
100 | 100 |
endif #CONFIG_BSD_USER |
101 | 101 |
|
... | ... | |
155 | 155 |
|
156 | 156 |
ifdef QEMU_PROGW |
157 | 157 |
# The linker builds a windows executable. Make also a console executable. |
158 |
$(QEMU_PROGW): $(all-obj-y) ../libqemustub.a |
|
158 |
$(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
|
|
159 | 159 |
$(call LINK,$^) |
160 | 160 |
$(QEMU_PROG): $(QEMU_PROGW) |
161 | 161 |
$(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)") |
162 | 162 |
else |
163 |
$(QEMU_PROG): $(all-obj-y) ../libqemustub.a |
|
163 |
$(QEMU_PROG): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
|
|
164 | 164 |
$(call LINK,$^) |
165 | 165 |
endif |
166 | 166 |
|
b/tests/Makefile | ||
---|---|---|
72 | 72 |
|
73 | 73 |
test-qapi-obj-y = $(qobject-obj-y) $(qapi-obj-y) |
74 | 74 |
test-qapi-obj-y += tests/test-qapi-visit.o tests/test-qapi-types.o |
75 |
test-qapi-obj-y += module.o |
|
76 | 75 |
|
77 | 76 |
$(test-obj-y): QEMU_INCLUDES += -Itests |
78 | 77 |
|
... | ... | |
98 | 97 |
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o tests -p "test-" < $<, " GEN $@") |
99 | 98 |
|
100 | 99 |
|
101 |
tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y) libqemustub.a |
|
102 |
tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(test-qapi-obj-y) libqemustub.a |
|
103 |
tests/test-qmp-output-visitor$(EXESUF): tests/test-qmp-output-visitor.o $(test-qapi-obj-y) libqemustub.a |
|
104 |
tests/test-qmp-input-visitor$(EXESUF): tests/test-qmp-input-visitor.o $(test-qapi-obj-y) libqemustub.a |
|
105 |
tests/test-qmp-input-strict$(EXESUF): tests/test-qmp-input-strict.o $(test-qapi-obj-y) libqemustub.a |
|
106 |
tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp-marshal.o $(test-qapi-obj-y) libqemustub.a |
|
107 |
tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(test-qapi-obj-y) libqemustub.a |
|
100 |
tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a
|
|
101 |
tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a
|
|
102 |
tests/test-qmp-output-visitor$(EXESUF): tests/test-qmp-output-visitor.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a
|
|
103 |
tests/test-qmp-input-visitor$(EXESUF): tests/test-qmp-input-visitor.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a
|
|
104 |
tests/test-qmp-input-strict$(EXESUF): tests/test-qmp-input-strict.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a
|
|
105 |
tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp-marshal.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a
|
|
106 |
tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(test-qapi-obj-y) libqemuutil.a libqemustub.a
|
|
108 | 107 |
|
109 | 108 |
tests/rtc-test$(EXESUF): tests/rtc-test.o $(trace-obj-y) |
110 | 109 |
tests/m48t59-test$(EXESUF): tests/m48t59-test.o $(trace-obj-y) |
... | ... | |
117 | 116 |
QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TARGET),)) |
118 | 117 |
check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) |
119 | 118 |
|
120 |
qtest-obj-y = tests/libqtest.o $(util-obj-y) libqemustub.a
|
|
119 |
qtest-obj-y = tests/libqtest.o libqemuutil.a libqemustub.a
|
|
121 | 120 |
$(check-qtest-y): $(qtest-obj-y) |
122 | 121 |
|
123 | 122 |
.PHONY: check-help |
Also available in: Unified diff