summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rw-r--r--Makefile.target8
2 files changed, 15 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 3cf7e504cd..bc978167ce 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,9 @@ all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
for d in $(TARGET_DIRS); do \
$(MAKE) -C $$d $@ || exit 1 ; \
done
+ifdef CONFIG_KQEMU
+ $(MAKE) -C kqemu
+endif
qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c
$(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
@@ -32,6 +35,9 @@ clean:
for d in $(TARGET_DIRS); do \
$(MAKE) -C $$d $@ || exit 1 ; \
done
+ifdef CONFIG_KQEMU
+ $(MAKE) -C kqemu clean
+endif
distclean: clean
rm -f config-host.mak config-host.h
@@ -63,6 +69,9 @@ endif
for d in $(TARGET_DIRS); do \
$(MAKE) -C $$d $@ || exit 1 ; \
done
+ifdef CONFIG_KQEMU
+ cd kqemu ; ./install.sh
+endif
# various test targets
test speed test2: all
diff --git a/Makefile.target b/Makefile.target
index 0efc9d1c91..5ed2b92546 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -237,8 +237,8 @@ SRCS:= $(OBJS:.o=.c)
OBJS+= libqemu.a
# cpu emulator library
-LIBOBJS=exec.o translate-all.o cpu-exec.o\
- translate.o op.o
+LIBOBJS=exec.o kqemu.o translate-all.o cpu-exec.o\
+ translate.o op.o
ifeq ($(TARGET_ARCH), i386)
LIBOBJS+=helper.o helper2.o
@@ -363,6 +363,10 @@ ifndef CONFIG_WIN32
VL_LIBS=-lutil
endif
endif
+ifdef TARGET_GPROF
+vl.o: CFLAGS+=-p
+VL_LDFLAGS+=-p
+endif
$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
$(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(VL_LIBS)