cpu_single_env init

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index df44a5e..4d76abc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,16 +8,22 @@ LDFLAGS=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE
 ifndef CONFIG_WIN32
-TOOLS=qemu-mkcow
+TOOLS=qemu-mkcow vmdk2raw
+endif
+ifdef CONFIG_STATIC
+LDFLAGS+=-static
 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) $(DEFINES) -o $@ $^ $(LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
+
+vmdk2raw: vmdk2raw.c
+       $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
 
 dyngen$(EXESUF): dyngen.c
        $(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^
@@ -26,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
@@ -42,20 +48,24 @@ install: all
 ifndef CONFIG_WIN32
        install -m 755 -s $(TOOLS) "$(bindir)"
 endif
-       mkdir -p "$(sharedir)"
+       mkdir -p "$(datadir)"
        install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
-                       pc-bios/linux_boot.bin "$(sharedir)"
+                       pc-bios/vgabios-cirrus.bin \
+                       pc-bios/ppc_rom.bin \
+                       pc-bios/linux_boot.bin "$(datadir)"
+       mkdir -p "$(docdir)"
+       install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
 ifndef CONFIG_WIN32
        mkdir -p "$(mandir)/man1"
        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]
@@ -80,15 +90,21 @@ tar:
 # generate a binary distribution
 tarbin:
        ( cd / ; tar zcvf ~/qemu-$(VERSION)-i386.tar.gz \
-       $(prefix)/bin/qemu $(prefix)/bin/qemu-fast \
-       $(prefix)/bin/qemu-system-ppc \
-       $(prefix)/bin/qemu-i386 \
-        $(prefix)/bin/qemu-arm \
-        $(prefix)/bin/qemu-sparc \
-        $(prefix)/bin/qemu-ppc \
-       $(sharedir)/bios.bin \
-       $(sharedir)/vgabios.bin \
-       $(mandir)/man1/qemu.1 )
+       $(bindir)/qemu $(bindir)/qemu-fast \
+       $(bindir)/qemu-system-ppc \
+       $(bindir)/qemu-i386 \
+        $(bindir)/qemu-arm \
+        $(bindir)/qemu-sparc \
+        $(bindir)/qemu-ppc \
+        $(bindir)/qemu-mkcow $(bindir)/vmdk2raw \
+       $(datadir)/bios.bin \
+       $(datadir)/vgabios.bin \
+       $(datadir)/vgabios-cirrus.bin \
+       $(datadir)/ppc_rom.bin \
+       $(datadir)/linux_boot.bin \
+       $(docdir)/qemu-doc.html \
+       $(docdir)/qemu-tech.html \
+       $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-mkcow.1 )
 
 ifneq ($(wildcard .depend),)
 include .depend