PowerPC merge: real time TB and decrementer - faster and simpler exception handling...

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index b3da266..4137e9b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,40 @@
 include config-host.mak
 
 CFLAGS=-Wall -O2 -g
+ifdef CONFIG_WIN32
+CFLAGS+=-fpack-struct 
+endif
 LDFLAGS=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE
-TOOLS=qemu-mkcow
+ifndef CONFIG_WIN32
+TOOLS=qemu-mkcow vmdk2raw
+endif
+ifdef CONFIG_STATIC
+LDFLAGS+=-static
+endif
 
-all: dyngen $(TOOLS) qemu-doc.html qemu.1
+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.o
-       $(HOST_CC) -o $@ $^  $(LIBS)
+qemu-mkcow: qemu-mkcow.c
+       $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
 
-dyngen: dyngen.o
-       $(HOST_CC) -o $@ $^  $(LIBS)
+vmdk2raw: vmdk2raw.c
+       $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
 
-%.o: %.c
-       $(HOST_CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
+dyngen$(EXESUF): dyngen.c
+       $(HOST_CC) $(CFLAGS) $(DEFINES) -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 qemu.pod
+       rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS qemu.pod
+       $(MAKE) -C tests clean
        for d in $(TARGET_DIRS); do \
-       make -C $$d $@ || exit 1 ; \
+       $(MAKE) -C $$d $@ || exit 1 ; \
         done
 
 distclean: clean
@@ -35,25 +44,32 @@ distclean: clean
         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
+       mkdir -p "$(bindir)"
+ifndef CONFIG_WIN32
+       install -m 755 -s $(TOOLS) "$(bindir)"
+endif
+       mkdir -p "$(datadir)"
+       install -m 644 pc-bios/bios.bin pc-bios/vgabios.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: all
-       make -C tests $@
+test speed test2: all
+       $(MAKE) -C tests $@
 
 TAGS: 
        etags *.[ch] tests/*.[ch]
 
 # documentation
-qemu-doc.html: qemu-doc.texi
+%.html: %.texi
        texi2html -monolithic -number $<
 
 qemu.1: qemu-doc.texi
@@ -66,17 +82,25 @@ FILE=qemu-$(shell cat VERSION)
 tar:
        rm -rf /tmp/$(FILE)
        cp -r . /tmp/$(FILE)
-       ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(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 \
+       $(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)/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