fixed C0 status codes (Ralf Baechle)

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index eb353ba9a8a9bba5a69bc1a7f6ac0141bc94f93b..11b38d15f1a85a59ee99b694a0cf1443b2eaf7cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,6 @@ CFLAGS=-Wall -O2 -g -fno-strict-aliasing
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
-ifdef CONFIG_WIN32
-CFLAGS+=-fpack-struct 
-endif
 LDFLAGS=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -20,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 block-vpc.c block-vvfat.c
        $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
 
 dyngen$(EXESUF): dyngen.c
@@ -35,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
@@ -42,6 +49,10 @@ distclean: clean
        rm -rf $$d || exit 1 ; \
         done
 
+KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \
+ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \
+common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
+
 install: all 
        mkdir -p "$(bindir)"
        install -m 755 -s $(TOOLS) "$(bindir)"
@@ -49,7 +60,7 @@ install: all
        install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
                        pc-bios/vgabios-cirrus.bin \
                        pc-bios/ppc_rom.bin \
-                       pc-bios/proll.bin \
+                       pc-bios/proll.elf \
                        pc-bios/linux_boot.bin "$(datadir)"
        mkdir -p "$(docdir)"
        install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
@@ -57,11 +68,14 @@ ifndef CONFIG_WIN32
        mkdir -p "$(mandir)/man1"
        install qemu.1 qemu-img.1 "$(mandir)/man1"
        mkdir -p "$(datadir)/keymaps"
-       install -m 644 keymaps/* "$(datadir)"
+       install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps"
 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
@@ -94,9 +108,10 @@ tar:
 # generate a binary distribution
 tarbin:
        ( cd / ; tar zcvf ~/qemu-$(VERSION)-i386.tar.gz \
-       $(bindir)/qemu $(bindir)/qemu-fast \
+       $(bindir)/qemu \
        $(bindir)/qemu-system-ppc \
        $(bindir)/qemu-system-sparc \
+       $(bindir)/qemu-system-x86_64 \
        $(bindir)/qemu-i386 \
         $(bindir)/qemu-arm \
         $(bindir)/qemu-sparc \
@@ -106,7 +121,7 @@ tarbin:
        $(datadir)/vgabios.bin \
        $(datadir)/vgabios-cirrus.bin \
        $(datadir)/ppc_rom.bin \
-       $(datadir)/proll.bin \
+       $(datadir)/proll.elf \
        $(datadir)/linux_boot.bin \
        $(docdir)/qemu-doc.html \
        $(docdir)/qemu-tech.html \