Revision 957f1f99
| b/Makefile | ||
|---|---|---|
| 166 | 166 |
$(qapi-obj-y): $(GENERATED_HEADERS) |
| 167 | 167 |
qapi-dir := qapi-generated |
| 168 | 168 |
test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir) |
| 169 |
qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) |
|
| 169 | 170 |
|
| 170 | 171 |
$(qapi-dir)/test-qapi-types.c: $(qapi-dir)/test-qapi-types.h |
| 171 | 172 |
$(qapi-dir)/test-qapi-types.h: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py |
| ... | ... | |
| 192 | 193 |
test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h test-qmp-marshal.c test-qmp-commands.h) $(qapi-obj-y) |
| 193 | 194 |
test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o |
| 194 | 195 |
|
| 195 |
QGALIB=qga/guest-agent-command-state.o qga/guest-agent-commands.o |
|
| 196 | 196 |
QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c) |
| 197 |
|
|
| 198 | 197 |
$(QGALIB_GEN): $(GENERATED_HEADERS) |
| 199 |
$(QGALIB) qemu-ga.o: $(QGALIB_GEN) $(qapi-obj-y) |
|
| 200 |
qemu-ga$(EXESUF): qemu-ga.o $(QGALIB) qemu-tool.o qemu-error.o error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(qapi-obj-y) qemu-timer-common.o qemu-sockets.o module.o qapi/qmp-dispatch.o qapi/qmp-registry.o $(qapi-dir)/qga-qapi-visit.o $(qapi-dir)/qga-qapi-types.o $(qapi-dir)/qga-qmp-marshal.o |
|
| 198 |
$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) |
|
| 199 |
|
|
| 200 |
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(trace-obj-y) $(qobject-obj-y) $(version-obj-y) $(addprefix $(qapi-dir)/, qga-qapi-visit.o qga-qapi-types.o qga-qmp-marshal.o) |
|
| 201 | 201 |
|
| 202 | 202 |
QEMULIBS=libhw32 libhw64 libuser libdis libdis-user |
| 203 | 203 |
|
| b/Makefile.objs | ||
|---|---|---|
| 396 | 396 |
qapi-nested-y += qmp-registry.o qmp-dispatch.o |
| 397 | 397 |
qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y)) |
| 398 | 398 |
|
| 399 |
###################################################################### |
|
| 400 |
# guest agent |
|
| 401 |
|
|
| 402 |
qga-nested-y = guest-agent-commands.o guest-agent-command-state.o |
|
| 403 |
qga-obj-y = $(addprefix qga/, $(qga-nested-y)) |
|
| 404 |
qga-obj-y += qemu-ga.o qemu-tool.o qemu-error.o qemu-sockets.o module.o qemu-option.o cutils.o osdep.o |
|
| 405 |
qga-obj-$(CONFIG_WIN32) += oslib-win32.o |
|
| 406 |
qga-obj-$(CONFIG_POSIX) += oslib-posix.o |
|
| 407 |
|
|
| 399 | 408 |
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) |
| 400 | 409 |
|
| 401 | 410 |
vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) |
| b/configure | ||
|---|---|---|
| 92 | 92 |
audio_pt_int="" |
| 93 | 93 |
audio_win_int="" |
| 94 | 94 |
cc_i386=i386-pc-linux-gnu-gcc |
| 95 |
libs_qga="" |
|
| 95 | 96 |
|
| 96 | 97 |
target_list="" |
| 97 | 98 |
|
| ... | ... | |
| 1849 | 1850 |
glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null` |
| 1850 | 1851 |
glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null` |
| 1851 | 1852 |
LIBS="$glib_libs $LIBS" |
| 1853 |
libs_qga="$glib_libs $libs_qga" |
|
| 1852 | 1854 |
else |
| 1853 | 1855 |
echo "glib-2.0 required to compile QEMU" |
| 1854 | 1856 |
exit 1 |
| ... | ... | |
| 3107 | 3109 |
echo "LIBS+=$LIBS" >> $config_host_mak |
| 3108 | 3110 |
echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak |
| 3109 | 3111 |
echo "EXESUF=$EXESUF" >> $config_host_mak |
| 3112 |
echo "LIBS_QGA+=$libs_qga" >> $config_host_mak |
|
| 3110 | 3113 |
|
| 3111 | 3114 |
# generate list of library paths for linker script |
| 3112 | 3115 |
|
Also available in: Unified diff