Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[thirdparty/qemu.git] / block / Makefile.objs

diff --git a/block/Makefile.objs b/block/Makefile.objs
index 425d7fbb598b34329b6dba86264c1fedc18b7ffb..fd88c03ece132936a4babdc7adeb48a2a31c1663 100644 (file)
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -25,4 +25,15 @@ common-obj-y += commit.o
 common-obj-y += mirror.o
 common-obj-y += backup.o
 
-$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS)
+iscsi.o-cflags     := $(LIBISCSI_CFLAGS)
+iscsi.o-libs       := $(LIBISCSI_LIBS)
+curl.o-cflags      := $(CURL_CFLAGS)
+curl.o-libs        := $(CURL_LIBS)
+rbd.o-cflags       := $(RBD_CFLAGS)
+rbd.o-libs         := $(RBD_LIBS)
+gluster.o-cflags   := $(GLUSTERFS_CFLAGS)
+gluster.o-libs     := $(GLUSTERFS_LIBS)
+ssh.o-cflags       := $(LIBSSH2_CFLAGS)
+ssh.o-libs         := $(LIBSSH2_LIBS)
+qcow.o-libs        := -lz
+linux-aio.o-libs   := -laio