Bochs disk image support (Alex Beregszaszi)

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 3cf7e504cd372b04a44cb0764be8c9f285b87926..10b5235cc0df918741dbb79dd9a3ccd04509030c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,15 @@ all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
        for d in $(TARGET_DIRS); do \
        $(MAKE) -C $$d $@ || exit 1 ; \
         done
+ifdef CONFIG_KQEMU
+ifdef CONFIG_WIN32
+       $(MAKE) -C kqemu -f Makefile.winnt
+else
+       $(MAKE) -C kqemu
+endif
+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
+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 block-bochs.c
        $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
 
 dyngen$(EXESUF): dyngen.c
@@ -32,6 +39,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 +73,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