diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2012-06-19 16:19:16 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2012-06-19 16:19:16 +0000 |
| commit | bae371eefccc3c7e313ffe81e5c96770608c5adf (patch) | |
| tree | c22bff7ca26e64348c848ad29f71382e213e35a3 /emulators/qemu | |
| parent | da065ea93445187b9dcfb284b5d931b893e9ee59 (diff) | |
Notes
Diffstat (limited to 'emulators/qemu')
| -rw-r--r-- | emulators/qemu/Makefile | 18 | ||||
| -rw-r--r-- | emulators/qemu/files/patch-Makefile | 9 |
2 files changed, 18 insertions, 9 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 1f1180d9eb9b..34e29ef73eda 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -29,16 +29,16 @@ MAKE_JOBS_SAFE= yes OPTIONS_DEFINE= KQEMU RTL8139_TIMER SAMBA SDL GNUTLS CURL PCAP GNS3 \ CDROM_DMA ADD_AUDIO ALL_TARGETS -KQEMU_DESC= "Build with (alpha!) accelerator module" -RTL8139_TIMER_DESC= "allow use of re(4) nic with FreeBSD guests" -SAMBA_DESC= "samba dependency (for -smb)" -SDL_DESC= "SDL/X dependency (graphical output)" -GNUTLS_DESC= "gnutls dependency (vnc encryption)" -CURL_DESC= "libcurl dependency (remote images)" -PCAP_DESC= "pcap dependency (networking with bpf)" -GNS3_DESC= "gns3 patches (udp, promiscuous multicast)" +KQEMU_DESC= Build with (alpha!) accelerator module +RTL8139_TIMER_DESC= allow use of re(4) nic with FreeBSD guests +SAMBA_DESC= samba dependency (for -smb) +SDL_DESC= SDL/X dependency (graphical output) +GNUTLS_DESC= gnutls dependency (vnc encryption) +CURL_DESC= libcurl dependency (remote images) +PCAP_DESC= pcap dependency (networking with bpf) +GNS3_DESC= gns3 patches (udp, promiscuous multicast) CDROM_DMA_DESC= IDE CDROM DMA -ADD_AUDIO_DESC= "Emulate more audio hardware (experimental!)" +ADD_AUDIO_DESC= Emulate more audio hardware (experimental!) ALL_TARGETS_DESC= Also build non-x86 targets OPTIONS_DEFAULT= SDL GNUTLS CURL PCAP GNS3 CDROM_DMA ALL_TARGETS diff --git a/emulators/qemu/files/patch-Makefile b/emulators/qemu/files/patch-Makefile index ef7e69d4f3e2..ba61a5f20acd 100644 --- a/emulators/qemu/files/patch-Makefile +++ b/emulators/qemu/files/patch-Makefile @@ -36,3 +36,12 @@ Index: qemu/Makefile endif install: all $(if $(BUILD_DOCS),install-doc) +@@ -321,7 +321,7 @@ cscope: + + # documentation + %.html: %.texi +- $(call quiet-command,texi2html -I=. -monolithic -number $<," GEN $@") ++ $(call quiet-command,texi2html -I=. -monolithic --number-sections $<," GEN $@") + + %.info: %.texi + $(call quiet-command,makeinfo -I . $< -o $@," GEN $@") |