diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-24 15:37:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-24 15:38:00 +0000 |
| commit | 6dedf0522c3fdeb10fe27d4aef35f4c57f3d0806 (patch) | |
| tree | e1177c7fd43a8165c8f697ff0aa5a5e6fcdd7766 /block | |
| parent | 98b21dcdb331798709edafcd65b5b7a1e07302db (diff) | |
| parent | f966f9ddd175bdf82f12650c3b7b5a93cc421d88 (diff) | |
Merge remote-tracking branch 'remotes/bonzini/configure' into staging
* remotes/bonzini/configure:
build: softmmu targets do not have a "main.o" file
configure: Disable libtool if -fPIE does not work with it (bug #1257099)
block: convert block drivers linked with libs to modules
Makefile: introduce common-obj-m and block-obj-m for DSO
Makefile: install modules with "make install"
module: implement module loading
rules.mak: introduce DSO rules
darwin: do not use -mdynamic-no-pic
block: use per-object cflags and libs
rules.mak: allow per object cflags and libs
rules.mak: fix $(obj) to a real relative path
util: Split out exec_dir from os_find_datadir
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/Makefile.objs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/block/Makefile.objs b/block/Makefile.objs index e254a2180a..673aa7c8c9 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -24,4 +24,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 |