diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-08 15:13:37 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-08 15:13:37 -0300 |
| commit | a7499d3e8789cc066368218d0cfbd433c784785e (patch) | |
| tree | 6366de5172932bb3519db08c70ef1c44968db120 /Makefile | |
| parent | 308a35044ab347ea1030071244d16d8226b65f6d (diff) | |
| parent | 93d67ee69d6104976961fbc98654872de28a5c96 (diff) | |
Merge commit '93d67ee69d6104976961fbc98654872de28a5c96' into upstream-merge
* commit '93d67ee69d6104976961fbc98654872de28a5c96': (29 commits)
Fix hanging user monitor when using balloon command
sdl: improve grab exiting instructions
ppc: don't define bamboo-0.13 as the default machine
Update to a hopefully more future proof FSF address
i386-dis: remove dead assignments, spotted by clang
softfloat: remove dead assignments, spotted by clang
slirp: remove dead nested assignment, spotted by clang
slirp: remove dead initialization, spotted by clang
slirp: remove dead increments, spotted by clang
slirp: remove dead assignments, spotted by clang
target-arm: Fix missing 'return' in SRS handling.
Fix curses interaction with keymaps
use absolute URLs for .gitmodules
Documentation: Modify rule for html output (better looking output format)
scsi: update comment on the standards revision
qemu-nbd: Fix wrong description in qemu-nbd.texi
Build usb-ohci for PCs
ppc440_bamboo: Disable new virtio-serial features for 0.12 machine type
ppc440_bamboo: Add 0.12 and 0.13 machine types for backward compat
s390-virtio: Fix compile error for virtio-block init
...
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -184,7 +184,9 @@ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr ifdef INSTALL_BLOBS BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ video.x openbios-sparc32 openbios-sparc64 openbios-ppc \ -pxe-e1000.bin pxe-i82559er.bin \ +gpxe-eepro100-80861209.rom \ +gpxe-eepro100-80861229.rom \ +pxe-e1000.bin \ pxe-ne2k_pci.bin pxe-pcnet.bin \ pxe-rtl8139.bin pxe-virtio.bin \ bamboo.dtb petalogix-s3adsp1800.dtb \ @@ -250,15 +252,18 @@ cscope: cscope -b # documentation +MAKEINFO=makeinfo +MAKEINFOFLAGS=--no-headers --no-split --number-sections TEXIFLAG=$(if $(V),,--quiet) %.dvi: %.texi $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<," GEN $@") %.html: %.texi - $(call quiet-command,texi2html -I=. -monolithic -number $<," GEN $@") + $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \ + " GEN $@") %.info: %.texi - $(call quiet-command,makeinfo -I . $< -o $@," GEN $@") + $(call quiet-command,$(MAKEINFO) $< -o $@," GEN $@") %.pdf: %.texi $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<," GEN $@") |