PowerPC merge: real time TB and decrementer - faster and simpler exception handling...

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index 7645c08..4137e9b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ LDFLAGS=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE
 ifndef CONFIG_WIN32
-TOOLS=qemu-mkcow
+TOOLS=qemu-mkcow vmdk2raw
 endif
 ifdef CONFIG_STATIC
 LDFLAGS+=-static
@@ -16,12 +16,15 @@ endif
 
 all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1
        for d in $(TARGET_DIRS); do \
-       make -C $$d $@ || exit 1 ; \
+       $(MAKE) -C $$d $@ || exit 1 ; \
         done
 
 qemu-mkcow: qemu-mkcow.c
        $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
 
+vmdk2raw: vmdk2raw.c
+       $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
+
 dyngen$(EXESUF): dyngen.c
        $(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^
 
@@ -29,9 +32,9 @@ clean:
 # avoid old build problems by removing potentially incorrect old files
        rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h 
        rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS qemu.pod
-       make -C tests clean
+       $(MAKE) -C tests clean
        for d in $(TARGET_DIRS); do \
-       make -C $$d $@ || exit 1 ; \
+       $(MAKE) -C $$d $@ || exit 1 ; \
         done
 
 distclean: clean
@@ -55,12 +58,12 @@ ifndef CONFIG_WIN32
        install qemu.1 qemu-mkcow.1 "$(mandir)/man1"
 endif
        for d in $(TARGET_DIRS); do \
-       make -C $$d $@ || exit 1 ; \
+       $(MAKE) -C $$d $@ || exit 1 ; \
         done
 
 # various test targets
 test speed test2: all
-       make -C tests $@
+       $(MAKE) -C tests $@
 
 TAGS: 
        etags *.[ch] tests/*.[ch]
@@ -91,7 +94,7 @@ tarbin:
         $(bindir)/qemu-arm \
         $(bindir)/qemu-sparc \
         $(bindir)/qemu-ppc \
-        $(bindir)/qemu-mkcow \
+        $(bindir)/qemu-mkcow $(bindir)/vmdk2raw \
        $(datadir)/bios.bin \
        $(datadir)/vgabios.bin \
        $(datadir)/linux_boot.bin \