diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-02-10 21:48:51 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-02-10 21:48:51 +0000 |
| commit | e3086fbf8f3e8242f7b5040a7a080e051bb9c2b3 (patch) | |
| tree | ad7d398788ce4319b5763f5f0f27ddaa78de26cb | |
| parent | 7c3fc84d86764fddd8dbc5408409eb5b2b4dc96e (diff) | |
kqemu support
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1277 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | Makefile.target | 8 |
2 files changed, 15 insertions, 2 deletions
@@ -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) |