falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: move base QAPI files to libqemuutil.a 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-12-20 15:27:51 +01:00
parent 59cacde8cd
commit 576d55068d
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -206,7 +206,7 @@ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) $(qapi-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a
$(call LINK, $^) $(call LINK, $^)
clean: clean:

9
Makefile.objs
View File

@ -1,7 +1,7 @@
####################################################################### #######################################################################
# Common libraries for tools and emulators # Common libraries for tools and emulators
stub-obj-y = stubs/ stub-obj-y = stubs/
util-obj-y = util/ qobject/ util-obj-y = util/ qobject/ qapi/
####################################################################### #######################################################################
# coroutines # coroutines
@ -30,7 +30,7 @@ block-obj-y += main-loop.o iohandler.o qemu-timer.o
block-obj-$(CONFIG_POSIX) += aio-posix.o block-obj-$(CONFIG_POSIX) += aio-posix.o
block-obj-$(CONFIG_WIN32) += aio-win32.o block-obj-$(CONFIG_WIN32) += aio-win32.o
block-obj-y += block/ block-obj-y += block/
block-obj-y += $(qapi-obj-y) qapi-types.o qapi-visit.o block-obj-y += qapi-types.o qapi-visit.o
ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
@ -102,8 +102,6 @@ common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
###################################################################### ######################################################################
# qapi # qapi
qapi-obj-y = qapi/
common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o
common-obj-y += qmp.o hmp.o common-obj-y += qmp.o hmp.o
@ -116,8 +114,6 @@ universal-obj-y += hw/
universal-obj-y += qom/ universal-obj-y += qom/
universal-obj-y += disas/ universal-obj-y += disas/
universal-obj-y += $(trace-obj-y) universal-obj-y += $(trace-obj-y)
universal-obj-y += $(qapi-obj-y)
universal-obj-y += qapi-types.o qapi-visit.o
###################################################################### ######################################################################
# guest agent # guest agent
@ -136,7 +132,6 @@ nested-vars += \
stub-obj-y \ stub-obj-y \
util-obj-y \ util-obj-y \
qga-obj-y \ qga-obj-y \
qapi-obj-y \
block-obj-y \ block-obj-y \
common-obj-y \ common-obj-y \
universal-obj-y \ universal-obj-y \

8
qapi/Makefile.objs
View File

@ -1,5 +1,5 @@
qapi-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o util-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o
qapi-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o util-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o
qapi-obj-y += string-input-visitor.o string-output-visitor.o util-obj-y += string-input-visitor.o string-output-visitor.o
common-obj-y += opts-visitor.o util-obj-y += opts-visitor.o

3
tests/Makefile
View File

@ -70,8 +70,7 @@ test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \
tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \ tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \
tests/test-qmp-commands.o tests/test-visitor-serialization.o tests/test-qmp-commands.o tests/test-visitor-serialization.o
test-qapi-obj-y = $(qapi-obj-y) test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o
test-qapi-obj-y += tests/test-qapi-visit.o tests/test-qapi-types.o
$(test-obj-y): QEMU_INCLUDES += -Itests $(test-obj-y): QEMU_INCLUDES += -Itests