base memory size in cmos

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index f2be1f6..15506a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,19 +11,16 @@ ifndef CONFIG_WIN32
 TOOLS=qemu-mkcow
 endif
 
-all: dyngen$(EXESUF) $(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)
+qemu-mkcow: qemu-mkcow.c
+       $(CC) $(CFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
 
-dyngen$(EXESUF): dyngen.o
-       $(HOST_CC) -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
@@ -41,13 +38,17 @@ distclean: clean
         done
 
 install: all 
-       mkdir -p $(prefix)/bin
-       install -m 755 -s $(TOOLS) $(prefix)/bin
-       mkdir -p $(sharedir)
+       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)
-       mkdir -p $(mandir)/man1
-       install qemu.1 qemu-mkcow.1 $(mandir)/man1
+                       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
@@ -60,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