update

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 9f1d31c364fabb612e2a19559b868b6028215765..50c51020a08a6f0852045146ff05130e351e18ca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,20 @@ OP_CFLAGS+= -falign-functions=0
 else
 OP_CFLAGS+= -malign-functions=0
 endif
+# WARNING: this LDFLAGS is _very_ tricky : qemu is an ELF shared object
+# that the kernel ELF loader considers as an executable. I think this
+# is the simplest way to make it self virtualizable!
+LDFLAGS+=-Wl,-shared
 endif
 
 ifeq ($(ARCH),ppc)
 OP_CFLAGS=$(CFLAGS)
+LDFLAGS+=-Wl,-T,ppc.ld
+endif
+
+ifeq ($(ARCH),s390)
+OP_CFLAGS=$(CFLAGS)
+LDFLAGS+=-Wl,-T,s390.ld
 endif
 
 ifeq ($(GCC_MAJOR),3)
@@ -27,8 +37,7 @@ endif
 #########################################################
 
 DEFINES+=-D_GNU_SOURCE
-LDSCRIPT=$(ARCH).ld
-LIBS+=-ldl -lm
+LIBS+=-lm
 
 # profiling code
 ifdef TARGET_GPROF
@@ -36,24 +45,25 @@ LDFLAGS+=-p
 main.o: CFLAGS+=-p
 endif
 
-OBJS= elfload.o main.o thunk.o syscall.o signal.o libgemu.a
+OBJS= elfload.o main.o syscall.o signal.o path.o
+SRCS:= $(OBJS:.o=.c)
+OBJS+= libqemu.a
 
-LIBOBJS+=translate-i386.o op-i386.o exec-i386.o
+LIBOBJS+=thunk.o translate-i386.o op-i386.o exec-i386.o
 # NOTE: the disassembler code is only needed for debugging
 LIBOBJS+=i386-dis.o dis-buf.o
-SRCS = $(OBJS:.o=.c)
 
-all: gemu
+all: qemu qemu-doc.html
 
-gemu: $(OBJS)
-       $(CC) -Wl,-T,$(LDSCRIPT) $(LDFLAGS) -o $@ $^  $(LIBS)
+qemu: $(OBJS)
+       $(CC) $(LDFLAGS) -o $@ $^  $(LIBS)
 
 depend: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-# libgemu 
+# libqemu 
 
-libgemu.a: $(LIBOBJS)
+libqemu.a: $(LIBOBJS)
        rm -f $@
        $(AR) rcs $@ $(LIBOBJS)
 
@@ -73,36 +83,44 @@ op-i386.o: op-i386.c opreg_template.h ops_template.h
 
 clean:
        $(MAKE) -C tests clean
-       rm -f *.o  *.a *~ gemu dyngen TAGS
+       rm -f *.o  *.a *~ qemu dyngen TAGS
 
 distclean: clean
        rm -f config.mak config.h
 
-install: gemu
-       install -m755 -s gemu $(prefix)/bin
+install: qemu
+       install -m 755 -s qemu $(prefix)/bin
 
 # various test targets
-test speed: gemu
+test speed: qemu
        make -C tests $@
 
 TAGS: 
        etags *.[ch] i386/*.[ch]
 
+# documentation
+qemu-doc.html: qemu-doc.texi
+       texi2html -monolithic -number $<
+
 FILES= \
-COPYING.LIB  dyngen.c    ioctls.h          ops_template.h  syscall_types.h\
-Makefile     elf.h       linux_bin.h       segment.h       thunk.c\
-TODO         elfload.c   main.c            signal.c        thunk.h\
-cpu-i386.h   gemu.h      op-i386.c opc-i386.h syscall-i386.h  translate-i386.c\
-dis-asm.h    gen-i386.h  op-i386.h         syscall.c\
+README README.distrib COPYING COPYING.LIB TODO Changelog VERSION \
+dyngen.c ioctls.h ops_template.h op_string.h  syscall_types.h\
+Makefile     elf.h       thunk.c\
+elfload.c   main.c            signal.c        thunk.h\
+cpu-i386.h qemu.h op-i386.c opc-i386.h syscall-i386.h  translate-i386.c\
+dis-asm.h    gen-i386.h  syscall.c\
 dis-buf.c    i386-dis.c  opreg_template.h  syscall_defs.h\
-i386.ld ppc.ld exec-i386.h exec-i386.c configure VERSION \
+ppc.ld s390.ld exec-i386.h exec-i386.c path.c configure \
 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/hello.c tests/hello tests/sha1.c \
-tests/testsig.c tests/testclone.c tests/testthread.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=gemu-$(VERSION)
+FILE=qemu-$(VERSION)
 
 tar:
        rm -rf /tmp/$(FILE)
@@ -111,6 +129,15 @@ tar:
        ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) )
        rm -rf /tmp/$(FILE)
 
+# generate a binary distribution including the test binary environnment 
+BINPATH=/usr/local/qemu-i386
+
+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
+
 ifneq ($(wildcard .depend),)
 include .depend
 endif