base memory size in cmos

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index 4c49bd4..15506a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,31 @@
 include config-host.mak
 
 CFLAGS=-Wall -O2 -g
+ifdef CONFIG_WIN32
+CFLAGS+=-fpack-struct 
+endif
 LDFLAGS=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE
+ifndef CONFIG_WIN32
 TOOLS=qemu-mkcow
+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 ; \
         done
 
-qemu-mkcow: qemu-mkcow.o
-       $(HOST_CC) -o $@ $^  $(LIBS)
-
-dyngen: dyngen.o
-       $(HOST_CC) -o $@ $^  $(LIBS)
+qemu-mkcow: qemu-mkcow.c
+       $(CC) $(CFLAGS) $(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 ; \
@@ -36,12 +38,17 @@ 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 "$(sharedir)"
+       install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
+                       pc-bios/linux_boot.bin "$(sharedir)"
+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 ; \
         done
@@ -54,7 +61,7 @@ TAGS:
        etags *.[ch] tests/*.[ch]
 
 # documentation
-qemu-doc.html: qemu-doc.texi
+%.html: %.texi
        texi2html -monolithic -number $<
 
 qemu.1: qemu-doc.texi