fixed C0 status codes (Ralf Baechle)

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 15506a19c09efad5ea8158557902328b05450097..11b38d15f1a85a59ee99b694a0cf1443b2eaf7cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,32 @@
-include config-host.mak
+-include config-host.mak
 
-CFLAGS=-Wall -O2 -g
-ifdef CONFIG_WIN32
-CFLAGS+=-fpack-struct 
+CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
+ifdef CONFIG_DARWIN
+CFLAGS+= -mdynamic-no-pic
 endif
 LDFLAGS=-g
 LIBS=
-DEFINES+=-D_GNU_SOURCE
-ifndef CONFIG_WIN32
-TOOLS=qemu-mkcow
+DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+TOOLS=qemu-img$(EXESUF)
+ifdef CONFIG_STATIC
+LDFLAGS+=-static
 endif
+DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1
 
-all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1
+all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
        for d in $(TARGET_DIRS); do \
-       make -C $$d $@ || exit 1 ; \
+       $(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-mkcow: qemu-mkcow.c
-       $(CC) $(CFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
+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
        $(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^
@@ -25,11 +34,14 @@ dyngen$(EXESUF): dyngen.c
 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
+       rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~
+       $(MAKE) -C tests clean
        for d in $(TARGET_DIRS); do \
-       make -C $$d $@ || exit 1 ; \
+       $(MAKE) -C $$d $@ || exit 1 ; \
         done
+ifdef CONFIG_KQEMU
+       $(MAKE) -C kqemu clean
+endif
 
 distclean: clean
        rm -f config-host.mak config-host.h
@@ -37,25 +49,37 @@ 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)"
-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/proll.elf \
+                       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"
+       install qemu.1 qemu-img.1 "$(mandir)/man1"
+       mkdir -p "$(datadir)/keymaps"
+       install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps"
 endif
        for d in $(TARGET_DIRS); do \
-       make -C $$d $@ || exit 1 ; \
+       $(MAKE) -C $$d $@ || exit 1 ; \
         done
+ifdef CONFIG_KQEMU
+       cd kqemu ; ./install.sh
+endif
 
 # various test targets
 test speed test2: all
-       make -C tests $@
+       $(MAKE) -C tests $@
 
 TAGS: 
        etags *.[ch] tests/*.[ch]
@@ -68,6 +92,10 @@ qemu.1: qemu-doc.texi
        ./texi2pod.pl $< qemu.pod
        pod2man --section=1 --center=" " --release=" " qemu.pod > $@
 
+qemu-img.1: qemu-img.texi
+       ./texi2pod.pl $< qemu-img.pod
+       pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
+
 FILE=qemu-$(shell cat VERSION)
 
 # tar release (use 'make -k tar' on a checkouted tree)
@@ -80,14 +108,24 @@ tar:
 # generate a binary distribution
 tarbin:
        ( cd / ; tar zcvf ~/qemu-$(VERSION)-i386.tar.gz \
-       $(prefix)/bin/qemu $(prefix)/bin/qemu-fast \
-       $(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-system-ppc \
+       $(bindir)/qemu-system-sparc \
+       $(bindir)/qemu-system-x86_64 \
+       $(bindir)/qemu-i386 \
+        $(bindir)/qemu-arm \
+        $(bindir)/qemu-sparc \
+        $(bindir)/qemu-ppc \
+        $(bindir)/qemu-img \
+       $(datadir)/bios.bin \
+       $(datadir)/vgabios.bin \
+       $(datadir)/vgabios-cirrus.bin \
+       $(datadir)/ppc_rom.bin \
+       $(datadir)/proll.elf \
+       $(datadir)/linux_boot.bin \
+       $(docdir)/qemu-doc.html \
+       $(docdir)/qemu-tech.html \
+       $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
 
 ifneq ($(wildcard .depend),)
 include .depend