Signed-off-by: David Marchand <david.marchand@xxxxxxxxx>
---
Makefile | 8 ++++++++
configure | 3 +++
contrib/ivshmem-client/Makefile | 29 -----------------------------
contrib/ivshmem-server/Makefile | 29 -----------------------------
4 files changed, 11 insertions(+), 58 deletions(-)
delete mode 100644 contrib/ivshmem-client/Makefile
delete mode 100644 contrib/ivshmem-server/Makefile
diff --git a/Makefile b/Makefile
index b33aaac..0575898 100644
--- a/Makefile
+++ b/Makefile
@@ -283,6 +283,14 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a
$(call LINK, $^)
+IVSHMEM_CLIENT_OBJS=$(addprefix $(SRC_PATH)/contrib/ivshmem-client/, ivshmem-client.o main.o)
+ivshmem-client$(EXESUF): $(IVSHMEM_CLIENT_OBJS)
+ $(call LINK, $^)
+
+IVSHMEM_SERVER_OBJS=$(addprefix $(SRC_PATH)/contrib/ivshmem-server/, ivshmem-server.o main.o)
+ivshmem-server$(EXESUF): $(IVSHMEM_SERVER_OBJS) libqemuutil.a libqemustub.a
+ $(call LINK, $^)
+
clean:
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
diff --git a/configure b/configure
index 961bf6f..a41a16c 100755
--- a/configure
+++ b/configure
@@ -4125,6 +4125,9 @@ if test "$want_tools" = "yes" ; then
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) $tools"
fi
+ if [ "$kvm" = "yes" ] ; then
+ tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
+ fi
fi
if test "$softmmu" = yes ; then
if test "$virtfs" != no ; then
diff --git a/contrib/ivshmem-client/Makefile b/contrib/ivshmem-client/Makefile
deleted file mode 100644
index eee97c6..0000000
--- a/contrib/ivshmem-client/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 6WIND S.A., 2014
-#
-# This work is licensed under the terms of the GNU GPL, version 2 or
-# (at your option) any later version. See the COPYING file in the
-# top-level directory.
-
-S ?= $(CURDIR)
-O ?= $(CURDIR)
-
-CFLAGS += -Wall -Wextra -Werror -g
-LDFLAGS +=
-LDLIBS += -lrt
-
-VPATH = $(S)
-PROG = ivshmem-client
-OBJS := $(O)/ivshmem-client.o
-OBJS += $(O)/main.o
-
-$(O)/%.o: %.c
- $(CC) $(CFLAGS) -o $@ -c $<
-
-$(O)/$(PROG): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-.PHONY: all
-all: $(O)/$(PROG)
-
-clean:
- rm -f $(OBJS) $(O)/$(PROG)
diff --git a/contrib/ivshmem-server/Makefile b/contrib/ivshmem-server/Makefile
deleted file mode 100644
index 26b4a72..0000000
--- a/contrib/ivshmem-server/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 6WIND S.A., 2014
-#
-# This work is licensed under the terms of the GNU GPL, version 2 or
-# (at your option) any later version. See the COPYING file in the
-# top-level directory.
-
-S ?= $(CURDIR)
-O ?= $(CURDIR)
-
-CFLAGS += -Wall -Wextra -Werror -g
-LDFLAGS +=
-LDLIBS += -lrt
-
-VPATH = $(S)
-PROG = ivshmem-server
-OBJS := $(O)/ivshmem-server.o
-OBJS += $(O)/main.o
-
-$(O)/%.o: %.c
- $(CC) $(CFLAGS) -o $@ -c $<
-
-$(O)/$(PROG): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-.PHONY: all
-all: $(O)/$(PROG)
-
-clean:
- rm -f $(OBJS) $(O)/$(PROG)
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
