small test optimisations

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index 1ecf99c..4c49bd4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,14 @@ CFLAGS=-Wall -O2 -g
 LDFLAGS=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE
-TOOLS=vlmkcow
+TOOLS=qemu-mkcow
 
-all: dyngen $(TOOLS) qemu-doc.html
+all: dyngen $(TOOLS) qemu-doc.html qemu.1
        for d in $(TARGET_DIRS); do \
        make -C $$d $@ || exit 1 ; \
         done
 
-vlmkcow: vlmkcow.o
+qemu-mkcow: qemu-mkcow.o
        $(HOST_CC) -o $@ $^  $(LIBS)
 
 dyngen: dyngen.o
@@ -23,7 +23,8 @@ dyngen: dyngen.o
 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 TAGS
+       rm -f *.o *.a $(TOOLS) dyngen TAGS qemu.pod
+       make -C tests clean
        for d in $(TARGET_DIRS); do \
        make -C $$d $@ || exit 1 ; \
         done
@@ -31,18 +32,22 @@ clean:
 distclean: clean
        rm -f config-host.mak config-host.h
        for d in $(TARGET_DIRS); do \
-       rm -f $$d/config.h $$d/config.mak || exit 1 ; \
+       rm -rf $$d || exit 1 ; \
         done
 
 install: all 
        mkdir -p $(prefix)/bin
        install -m 755 -s $(TOOLS) $(prefix)/bin
+       mkdir -p $(sharedir)
+       install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin $(sharedir)
+       mkdir -p $(mandir)/man1
+       install qemu.1 $(mandir)/man1
        for d in $(TARGET_DIRS); do \
        make -C $$d $@ || exit 1 ; \
         done
 
 # various test targets
-test speed: all
+test speed test2: all
        make -C tests $@
 
 TAGS: 
@@ -52,50 +57,30 @@ TAGS:
 qemu-doc.html: qemu-doc.texi
        texi2html -monolithic -number $<
 
-FILES= \
-README README.distrib COPYING COPYING.LIB TODO Changelog VERSION \
-configure Makefile Makefile.target \
-dyngen.c dyngen.h dyngen-exec.h ioctls.h syscall_types.h \
-elf.h elfload.c main.c signal.c qemu.h \
-syscall.c syscall_defs.h vm86.c path.c mmap.c \
-i386.ld ppc.ld alpha.ld s390.ld sparc.ld arm.ld m68k.ld \
-vl.c i386-vl.ld vl.h block.c vlmkcow.c vga.c vga_template.h sdl.c \
-thunk.c cpu-exec.c translate.c cpu-all.h cpu-defs.h thunk.h exec.h\
-exec.c cpu-exec.c gdbstub.c bswap.h \
-cpu-i386.h op-i386.c helper-i386.c helper2-i386.c syscall-i386.h translate-i386.c \
-exec-i386.h ops_template.h ops_template_mem.h op_string.h opreg_template.h \
-ops_mem.h softmmu_template.h softmmu_header.h \
-cpu-arm.h syscall-arm.h exec-arm.h op-arm.c translate-arm.c op-arm-template.h \
-dis-asm.h disas.c disas.h alpha-dis.c ppc-dis.c i386-dis.c sparc-dis.c \
-arm-dis.c \
-tests/Makefile \
-tests/test-i386.c tests/test-i386-shift.h tests/test-i386.h \
-tests/test-i386-muldiv.h tests/test-i386-code16.S tests/test-i386-vm86.S \
-tests/hello-i386.c tests/hello-i386 \
-tests/hello-arm.c tests/hello-arm \
-tests/sha1.c \
-tests/testsig.c tests/testclone.c tests/testthread.c \
-tests/runcom.c tests/pi_10.com \
-tests/test_path.c \
-qemu-doc.texi qemu-doc.html
-
-FILE=qemu-$(VERSION)
+qemu.1: qemu-doc.texi
+       ./texi2pod.pl $< qemu.pod
+       pod2man --section=1 --center=" " --release=" " qemu.pod > $@
 
+FILE=qemu-$(shell cat VERSION)
+
+# tar release (use 'make -k tar' on a checkouted tree)
 tar:
        rm -rf /tmp/$(FILE)
-       mkdir -p /tmp/$(FILE)
-       cp -P $(FILES) /tmp/$(FILE)
-       ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) )
+       cp -r . /tmp/$(FILE)
+       ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
        rm -rf /tmp/$(FILE)
 
-# generate a binary distribution including the test binary environnment 
-BINPATH=/usr/local/qemu-i386
-
+# generate a binary distribution
 tarbin:
-       tar zcvf /tmp/qemu-$(VERSION)-i386-glibc21.tar.gz \
-                 $(BINPATH)/etc $(BINPATH)/lib $(BINPATH)/bin $(BINPATH)/usr
-       tar zcvf /tmp/qemu-$(VERSION)-i386-wine.tar.gz \
-                 $(BINPATH)/wine
+       ( 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 )
 
 ifneq ($(wildcard .depend),)
 include .depend