Commit 2954525b authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'bonzini/build-urgent' into staging 



* bonzini/build-urgent:
  Makefile: Add missing dependency (fix parallel builds)
  tests: link in stubs
  libcacard: link in stubs
  libcacard: make unnesting rules available to Makefile.objs

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents ad1db3b3 16529ced

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ pixman/Makefile: $(SRC_PATH)/pixman/configure 
$(SRC_PATH)/pixman/configure:

	(cd $(SRC_PATH)/pixman; autoreconf -v --install)



$(SUBDIR_RULES): libqemustub.a



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



$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser

libcacard/Makefile

+2 −2
Original line number Diff line number Diff line 
-include ../config-host.mak

-include $(SRC_PATH)/Makefile.objs

-include $(SRC_PATH)/rules.mak

-include $(SRC_PATH)/Makefile.objs



libcacard_includedir=$(includedir)/cacard



$(call set-vpath, $(SRC_PATH))



# objects linked into a shared library, built with libtool with -fPIC if required

QEMU_OBJS=$(oslib-obj-y) qemu-timer-common.o $(trace-obj-y)

QEMU_OBJS=$(oslib-obj-y) qemu-timer-common.o $(trace-obj-y) $(stub-obj-y)

QEMU_OBJS_LIB=$(patsubst %.o,%.lo,$(QEMU_OBJS))



QEMU_CFLAGS+=-I../

tests/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ tests/check-qdict$(EXESUF): tests/check-qdict.o qdict.o qfloat.o qint.o qstring. 
tests/check-qlist$(EXESUF): tests/check-qlist.o qlist.o qint.o

tests/check-qfloat$(EXESUF): tests/check-qfloat.o qfloat.o

tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) qemu-tool.o

tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) iov.o

tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) iov.o libqemustub.a

tests/test-iov$(EXESUF): tests/test-iov.o iov.o



tests/test-qapi-types.c tests/test-qapi-types.h :\
@@ -81,7 +81,7 @@ TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) 
QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TARGET),))

check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))



qtest-obj-y = tests/libqtest.o $(oslib-obj-y)

qtest-obj-y = tests/libqtest.o $(oslib-obj-y) libqemustub.a

$(check-qtest-y): $(qtest-obj-y)



.PHONY: check-help