typo

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index d4c4b0f..2a5425e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,29 @@
 include config-host.mak
 
-CFLAGS=-Wall -O2 -g
-ifdef CONFIG_WIN32
-CFLAGS+=-fpack-struct 
+CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
+ifdef CONFIG_DARWIN
+CFLAGS+= -mdynamic-no-pic
 endif
 LDFLAGS=-g
 LIBS=
-DEFINES+=-D_GNU_SOURCE
-ifndef CONFIG_WIN32
-TOOLS=qemu-mkcow vmdk2raw
-endif
+DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+TOOLS=qemu-img$(EXESUF)
 ifdef CONFIG_STATIC
 LDFLAGS+=-static
 endif
+ifdef BUILD_DOCS
+DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1
+else
+DOCS=
+endif
 
-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 ; \
         done
 
-qemu-mkcow: qemu-mkcow.c
-       $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
-
-vmdk2raw: vmdk2raw.c
-       $(CC) $(CFLAGS) $(LDFLAGS) $(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 $@ $^
@@ -31,32 +31,43 @@ 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
+       rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~
        $(MAKE) -C tests clean
        for d in $(TARGET_DIRS); do \
        $(MAKE) -C $$d $@ || exit 1 ; \
         done
 
 distclean: clean
-       rm -f config-host.mak config-host.h
+       rm -f config-host.mak config-host.h $(DOCS)
        for d in $(TARGET_DIRS); do \
        rm -rf $$d || exit 1 ; \
         done
 
-install: all 
-       mkdir -p "$(bindir)"
+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-doc: $(DOCS)
+       mkdir -p "$(DESTDIR)$(docdir)"
+       $(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
 ifndef CONFIG_WIN32
-       install -m 755 -s $(TOOLS) "$(bindir)"
+       mkdir -p "$(DESTDIR)$(mandir)/man1"
+       $(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
 endif
-       mkdir -p "$(datadir)"
-       install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
-                       pc-bios/vgabios-cirrus.bin \
-                       pc-bios/linux_boot.bin "$(datadir)"
-       mkdir -p "$(docdir)"
-       install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
+
+install: all $(if $(BUILD_DOCS),install-doc)
+       mkdir -p "$(DESTDIR)$(bindir)"
+       $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+       mkdir -p "$(DESTDIR)$(datadir)"
+       for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
+                       video.x proll.elf linux_boot.bin; do \
+               $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+       done
 ifndef CONFIG_WIN32
-       mkdir -p "$(mandir)/man1"
-       install qemu.1 qemu-mkcow.1 "$(mandir)/man1"
+       mkdir -p "$(DESTDIR)$(datadir)/keymaps"
+       for x in $(KEYMAPS); do \
+               $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
+       done
 endif
        for d in $(TARGET_DIRS); do \
        $(MAKE) -C $$d $@ || exit 1 ; \
@@ -69,14 +80,29 @@ test speed test2: all
 TAGS: 
        etags *.[ch] tests/*.[ch]
 
+cscope:
+       rm -f ./cscope.*
+       find . -name "*.[ch]" -print > ./cscope.files
+       cscope -b
+
 # documentation
 %.html: %.texi
        texi2html -monolithic -number $<
 
+%.info: %.texi
+       makeinfo $< -o $@
+
+%.dvi: %.texi
+       texi2dvi $<
+
 qemu.1: qemu-doc.texi
-       ./texi2pod.pl $< qemu.pod
+       $(SRC_PATH)/texi2pod.pl $< qemu.pod
        pod2man --section=1 --center=" " --release=" " qemu.pod > $@
 
+qemu-img.1: qemu-img.texi
+       $(SRC_PATH)/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)
@@ -89,20 +115,31 @@ 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-system-mips \
+       $(bindir)/qemu-system-mipsel \
+       $(bindir)/qemu-system-arm \
        $(bindir)/qemu-i386 \
         $(bindir)/qemu-arm \
+        $(bindir)/qemu-armeb \
         $(bindir)/qemu-sparc \
         $(bindir)/qemu-ppc \
-        $(bindir)/qemu-mkcow $(bindir)/vmdk2raw \
+        $(bindir)/qemu-mips \
+        $(bindir)/qemu-mipsel \
+        $(bindir)/qemu-img \
        $(datadir)/bios.bin \
        $(datadir)/vgabios.bin \
        $(datadir)/vgabios-cirrus.bin \
+       $(datadir)/ppc_rom.bin \
+       $(datadir)/video.x \
+       $(datadir)/proll.elf \
        $(datadir)/linux_boot.bin \
        $(docdir)/qemu-doc.html \
        $(docdir)/qemu-tech.html \
-       $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-mkcow.1 )
+       $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
 
 ifneq ($(wildcard .depend),)
 include .depend